summaryrefslogtreecommitdiff
path: root/lisp/emulation/viper-keym.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/emulation/viper-keym.el')
-rw-r--r--lisp/emulation/viper-keym.el13
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 2ff89a7f6df..370ae3de291 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -31,11 +31,14 @@
(defvar vip-ex-style-editing-in-insert)
(defvar vip-ex-style-motion)
-(eval-when-compile
- (let ((load-path (cons (expand-file-name ".") load-path)))
- (or (featurep 'viper-util)
- (load "viper-util.el" nil nil 'nosuffix))
- ))
+;; 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 nil 'nosuffix))
+ )))
;; end pacifier
(require 'viper-util)