--- a/lisp/viper/viper-init.el	Mon Aug 13 09:42:28 2007 +0200
+++ b/lisp/viper/viper-init.el	Mon Aug 13 09:43:35 2007 +0200
@@ -25,8 +25,16 @@
 
 ;; compiler pacifier
 (defvar mark-even-if-inactive)
+(defvar viper-version)
 ;; end pacifier
 
+
+;; Viper version
+(defun viper-version ()
+  (interactive)
+  (message "Viper version is %s" viper-version)) 
+(defalias 'vip-version 'viper-version)
+
 ;; Is it XEmacs?
 (defconst vip-xemacs-p (string-match "\\(Lucid\\|XEmacs\\)" emacs-version))
 ;; Is it Emacs?
@@ -122,15 +130,6 @@
 
 ;;; Viper minor modes
 
-;; This is not local in Emacs, so we make it local.
-;; This must be local because although the stack of minor modes can be the same
-;; for all buffers, the associated *keymaps* can be different. In Viper,
-;; vip-vi-local-user-map, vip-insert-local-user-map, and others can have
-;; different keymaps for different buffers.
-;; Also, the keymaps associated with vip-vi/insert-state-modifier-minor-mode
-;; can be different.
-(make-variable-buffer-local 'minor-mode-map-alist)
-
 ;; Mode for vital things like \e, C-z.
 (vip-deflocalvar vip-vi-intercept-minor-mode nil)
 
@@ -597,16 +596,10 @@
 
 ;;; Miscellaneous
 
-;; don't bark when mark is inactive
-(setq mark-even-if-inactive t)
-
 (defvar vip-inhibit-startup-message nil
   "Whether Viper startup message should be inhibited.")
 
-(defvar vip-always t
-  "t means, arrange that vi-state will be a default.")
-
-(defvar vip-custom-file-name (vip-convert-standard-file-name "~/.vip")
+(defvar vip-custom-file-name (vip-convert-standard-file-name "~/.viper")
   "Viper customisation file.
 This variable must be set _before_ loading Viper.")
 
@@ -634,12 +627,6 @@
 ;; Beginning with Emacs 19.26, the standard `minibuffer-exit-hook' is run
 ;; *after* exiting the minibuffer
 (defvar vip-minibuffer-exit-hook nil)
-
-;; setup emacs-supported vi-style feel
-(setq next-line-add-newlines nil
-      require-final-newline t)
-
-(make-variable-buffer-local 'require-final-newline)
        
 
 ;; Mode line
@@ -652,15 +639,6 @@
 (defconst vip-replace-state-id	"<R> "
   "Mode line tag identifying the Replace mode of Viper.")
 
-;; Viper changes the default mode-line-buffer-identification
-(setq-default mode-line-buffer-identification '(" %b"))
-
-;; Variable displaying the current Viper state in the mode line.
-(vip-deflocalvar vip-mode-string vip-emacs-state-id)
-(or (memq 'vip-mode-string global-mode-string)
-    (setq global-mode-string
-	  (append '("" vip-mode-string) (cdr global-mode-string))))
-
 
 (defvar vip-vi-state-hook nil
   "*Hooks run just before the switch to Vi mode is completed.")