--- a/lisp/viper/viper-keym.el	Mon Aug 13 09:42:28 2007 +0200
+++ b/lisp/viper/viper-keym.el	Mon Aug 13 09:43:35 2007 +0200
@@ -24,18 +24,21 @@
 (provide 'viper-keym)
 
 ;; compiler pacifier
-(defvar vip-always)
+(defvar viper-always)
 (defvar vip-current-state)
 (defvar vip-mode-string)
 (defvar vip-expert-level)
 (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)
@@ -583,7 +586,7 @@
     
     (princ (format "\nvip-expert-level  %S\n" vip-expert-level))
     (princ (format "vip-no-multiple-ESC  %S\n" vip-no-multiple-ESC))
-    (princ (format "vip-always  %S\n" vip-always))
+    (princ (format "viper-always  %S\n" viper-always))
     (princ (format "vip-ex-style-motion  %S\n"
 		   vip-ex-style-motion))
     (princ (format "vip-ex-style-editing-in-insert  %S\n"