Mercurial > emacs

changeset 86976:36265e68634f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(top-level): Don't require ring. Don't load viper-init, viper-cmd when compiling.
author Glenn Morris <rgm@gnu.org>
date Sun, 02 Dec 2007 20:59:21 +0000
parents a8ff69ac6d14
children e58f5bc93477
files lisp/emulation/viper.el
diffstat 1 files changed, 1 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emulation/viper.el	Sun Dec 02 20:54:24 2007 +0000
+++ b/lisp/emulation/viper.el	Sun Dec 02 20:59:21 2007 +0000
@@ -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)