# HG changeset patch # User Glenn Morris # Date 1196629435 0 # Node ID 80bc7ed827aa4e5d5c96afdb9e64e19de32fb297 # Parent 48163f8e5648ccb6c2c8f5243dd04eeabec61ffd (top-level): Don't require advice. Don't load viper-util, viper-keym, viper-mous, viper-macs, viper-ex when compiling. diff -r 48163f8e5648 -r 80bc7ed827aa lisp/emulation/viper-cmd.el --- a/lisp/emulation/viper-cmd.el Sun Dec 02 21:02:58 2007 +0000 +++ b/lisp/emulation/viper-cmd.el Sun Dec 02 21:03:55 2007 +0000 @@ -27,7 +27,6 @@ ;;; Code: (provide 'viper-cmd) -(require 'advice) ;; Compiler pacifier (defvar viper-minibuffer-current-face) @@ -48,23 +47,6 @@ (defvar initial) (defvar undo-beg-posn) (defvar undo-end-posn) - -;; loading happens only in non-interactive compilation -;; in order to spare non-viperized emacs from being viperized -(if noninteractive - (eval-when-compile - (let ((load-path (cons (expand-file-name ".") load-path))) - (or (featurep 'viper-util) - (load "viper-util.el" nil t 'nosuffix)) - (or (featurep 'viper-keym) - (load "viper-keym.el" nil t 'nosuffix)) - (or (featurep 'viper-mous) - (load "viper-mous.el" nil t 'nosuffix)) - (or (featurep 'viper-macs) - (load "viper-macs.el" nil t 'nosuffix)) - (or (featurep 'viper-ex) - (load "viper-ex.el" nil t 'nosuffix)) - ))) ;; end pacifier