2 files changed, 26 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6167400fd0e..54d2762f451 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,29 @@
+2007-12-02  Glenn Morris  <rgm@gnu.org>
+
+        * emulation/viper-cmd.el (top-level): Don't require advice.
+        Don't load viper-util, viper-keym, viper-mous, viper-macs,
+        viper-ex when compiling.
+
+        * emulation/viper-ex.el (top-level): Don't load viper-util,
+        viper-keym when compiling.
+
+        * emulation/viper-init.el (top-level): Move provide statement to end.
+
+        * emulation/viper-keym.el (top-level): Don't load viper-util when
+        compiling.  Move provide statement to end.
+
+        * emulation/viper-macs.el (top-level): Don't load viper-util,
+        viper-keym, viper-mous when compiling.
+
+        * emulation/viper-mous.el (top-level): Don't load viper-util when
+        compiling.
+
+        * emulation/viper-util.el (top-level): Don't load viper-init when
+        compiling.
+
+        * emulation/viper.el (top-level): Don't require ring.
+        Don't load viper-init, viper-cmd when compiling.
+
 2007-12-02  Karl Fogel  <kfogel@red-bean.com>
 
         Offer option for saveplace to be quiet about loading and saving.
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index d6786c01987..5637fad59c7 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -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