(top-level): Don't load viper-util when compiling. Move provide

statement to end.

1 files changed, 3 insertions, 11 deletions

diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index e453983f496..85a94075720 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -26,8 +26,6 @@
 
 ;;; Code:
 
-(provide 'viper-keym)
-
 ;; compiler pacifier
 (defvar viper-always)
 (defvar viper-current-state)
@@ -35,15 +33,6 @@
 (defvar viper-expert-level)
 (defvar viper-ex-style-editing)
 (defvar viper-ex-style-motion)
-
-;; 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 t 'nosuffix))
-        )))
 ;; end pacifier
 
 (require 'viper-util)
@@ -705,6 +694,9 @@ form ((key . function) (key . function) ... )."
            alist))
 
 
+(provide 'viper-keym)
+
+
 ;;; Local Variables:
 ;;; eval: (put 'viper-deflocalvar 'lisp-indent-hook 'defun)
 ;;; End: