(top-level): Don't require ring.

Don't load viper-init, viper-cmd when compiling.

diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 7c256bfb420647e1adbfe88d494f74eeb7544d57..bb3e4eb583dd08ef7bb451249d374ce81d91ad06 100644 (file)
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -297,28 +297,15 @@
 
 ;;; Code:
 
-(require 'advice)
-(require 'ring)
-
 ;; compiler pacifier
 (defvar mark-even-if-inactive)
 (defvar quail-mode)
 (defvar viper-expert-level)
 (defvar viper-mode-string)
 (defvar viper-major-mode-modifier-list)
-
-;; 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-init)
-           (load "viper-init.el" nil t 'nosuffix))
-       (or (featurep 'viper-cmd)
-           (load "viper-cmd.el" nil t 'nosuffix))
-       )))
 ;; end pacifier
 
+(require 'advice)
 (require 'viper-init)
 (require 'viper-keym)