From: Glenn Morris <rgm@gnu.org>
Date: Sun, 2 Dec 2007 20:59:21 +0000 (+0000)
Subject: (top-level): Don't require ring.
X-Git-Tag: emacs-pretest-23.0.90~9146
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cdd489b0fb42b2c2328bfb00021e1cef817983c7;p=emacs.git

(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 7c256bfb420..bb3e4eb583d 100644
--- 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)