From cdd489b0fb42b2c2328bfb00021e1cef817983c7 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 2 Dec 2007 20:59:21 +0000 Subject: [PATCH] (top-level): Don't require ring. Don't load viper-init, viper-cmd when compiling. --- lisp/emulation/viper.el | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) 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)