* viper-cmd.el (viper--key-maps): new variable.

	(viper-normalize-minor-mode-map-alist): use viper--key-maps and
	emulation-mode-map-alists.
	(viper-envelop-ESC-key): use viper-subseq.
	(viper-search-forward/backward/next): disable debug-on-error.

	* viper-keym.el (viper-toggle-key,viper-quoted-insert-key,
	viper-ESC-key): new defcustoms.

	* viper-macs.el (ex-map-read-args): use viper-subseq.

	* viper-util.el (viper-key-to-emacs-key): use viper-subseq.
	(viper-subseq): copy of subseq from cl.el.

	* viper.el (viper-go-away,viper-set-hooks): use
	emulation-mode-map-alists, advise self-insert-command, add-minor-mode.

	* viper-mous.el (viper-current-frame-saved): use defvar.

	* viper-init.el: got rid of -face in face names.

	* ediff-diff.el (ediff-extract-diffs,ediff-extract-diffs3):
	Make it work with longlines mode

	* ediff-mult.el (ediff-meta-mode-hook): new variable.

	* ediff-ptch.el (ediff-file-name-sans-prefix): quote regexp.

	* ediff-init: got rid of -face in face names.

7 files changed, 199 insertions, 79 deletions

diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 4f247f2cd38..ecd5251891c 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -36,6 +36,8 @@
 (defvar viper-always)
 (defvar viper-mode-string)
 (defvar viper-custom-file-name)
+(defvar viper--key-maps)
+(defvar viper--intercept-key-maps)
 (defvar iso-accents-mode)
 (defvar quail-mode)
 (defvar quail-current-str)
@@ -92,7 +94,7 @@
 ;; Variables for defining VI commands
 
 ;; Modifying commands that can be prefixes to movement commands
-(defconst viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\"))
+(defvar viper-prefix-commands '(?c ?d ?y ?! ?= ?# ?< ?> ?\"))
 ;; define viper-prefix-command-p
 (viper-test-com-defun viper-prefix-command)
 
@@ -440,23 +442,24 @@
 ;; This ensures that Viper bindings are in effect, regardless of which minor
 ;; modes were turned on by the user or by other packages.
 (defun viper-normalize-minor-mode-map-alist ()
-  (setq minor-mode-map-alist
-        (viper-append-filter-alist
-         (list (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map)
-               (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map)
-               (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map)
-               (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map)
-               (cons 'viper-vi-global-user-minor-mode viper-vi-global-user-map)
-               (cons 'viper-vi-state-modifier-minor-mode
-                     (if (keymapp
-                          (cdr (assoc major-mode
-                                      viper-vi-state-modifier-alist)))
-                         (cdr (assoc major-mode viper-vi-state-modifier-alist))
-                       viper-empty-keymap))
-               (cons 'viper-vi-diehard-minor-mode  viper-vi-diehard-map)
-               (cons 'viper-vi-basic-minor-mode     viper-vi-basic-map)
-               (cons 'viper-insert-intercept-minor-mode
-                     viper-insert-intercept-map)
+  (setq viper--intercept-key-maps
+        (list
+         (cons 'viper-vi-intercept-minor-mode viper-vi-intercept-map)
+         (cons 'viper-insert-intercept-minor-mode viper-insert-intercept-map)
+         (cons 'viper-emacs-intercept-minor-mode viper-emacs-intercept-map)
+         ))
+  (setq viper--key-maps
+        (list (cons 'viper-vi-minibuffer-minor-mode viper-minibuffer-map)
+              (cons 'viper-vi-local-user-minor-mode viper-vi-local-user-map)
+              (cons 'viper-vi-kbd-minor-mode viper-vi-kbd-map)
+              (cons 'viper-vi-global-user-minor-mode viper-vi-global-user-map)
+              (cons 'viper-vi-state-modifier-minor-mode
+                    (if (keymapp
+                         (cdr (assoc major-mode viper-vi-state-modifier-alist)))
+                        (cdr (assoc major-mode viper-vi-state-modifier-alist))
+                      viper-empty-keymap))
+              (cons 'viper-vi-diehard-minor-mode  viper-vi-diehard-map)
+              (cons 'viper-vi-basic-minor-mode     viper-vi-basic-map)
                (cons 'viper-replace-minor-mode  viper-replace-map)
                ;; viper-insert-minibuffer-minor-mode must come after
                ;; viper-replace-minor-mode
@@ -476,8 +479,6 @@
                        viper-empty-keymap))
                (cons 'viper-insert-diehard-minor-mode viper-insert-diehard-map)
                (cons 'viper-insert-basic-minor-mode viper-insert-basic-map)
-               (cons 'viper-emacs-intercept-minor-mode
-                     viper-emacs-intercept-map)
                (cons 'viper-emacs-local-user-minor-mode
                      viper-emacs-local-user-map)
                (cons 'viper-emacs-kbd-minor-mode viper-emacs-kbd-map)
@@ -490,8 +491,16 @@
                          (cdr
                           (assoc major-mode viper-emacs-state-modifier-alist))
                        viper-empty-keymap))
-               )
-         minor-mode-map-alist)))
+               ))
+        
+  ;; in emacs with emulation-mode-map-alists, nothing needs to be done
+  (unless
+      (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
+    (setq minor-mode-map-alist
+          (viper-append-filter-alist
+           (append viper--intercept-key-maps viper--key-maps)
+           minor-mode-map-alist)))
+  )
 
 
 
@@ -1021,7 +1030,7 @@ as a Meta key and any number of multiple escapes is allowed."
                               (not viper-translate-all-ESC-keysequences))
                          ;; put keys following ESC on the unread list
                          ;; and return ESC as the key-sequence
-                         (viper-set-unread-command-events (subseq keyseq 1))
+                         (viper-set-unread-command-events (viper-subseq keyseq 1))
                          (setq last-input-event event
                                keyseq (if viper-emacs-p
                                           "\e"
@@ -1032,7 +1041,7 @@ as a Meta key and any number of multiple escapes is allowed."
                          (viper-set-unread-command-events
                           (vconcat (vector
                                     (character-to-event (event-key first-key)))
-                                   (subseq keyseq 1)))
+                                   (viper-subseq keyseq 1)))
                          (setq last-input-event event
                                keyseq (vector (character-to-event ?\e))))
                         ((eventp first-key)
@@ -3732,7 +3741,8 @@ Null string will repeat previous search."
   (interactive "P")
   (let ((val (viper-P-val arg))
         (com (viper-getcom arg))
-        (old-str viper-s-string))
+        (old-str viper-s-string)
+        debug-on-error)
     (setq viper-s-forward t)
     (viper-if-string "/")
     ;; this is not used at present, but may be used later
@@ -3744,7 +3754,8 @@ Null string will repeat previous search."
     (if com
         (progn
           (viper-move-marker-locally 'viper-com-point (mark t))
-          (viper-execute-com 'viper-search-next val com)))))
+          (viper-execute-com 'viper-search-next val com)))
+    ))
 
 (defun viper-search-backward (arg)
   "Search a string backward.
@@ -3753,7 +3764,8 @@ Null string will repeat previous search."
   (interactive "P")
   (let ((val (viper-P-val arg))
         (com (viper-getcom arg))
-        (old-str viper-s-string))
+        (old-str viper-s-string)
+        debug-on-error)
     (setq viper-s-forward nil)
     (viper-if-string "?")
     ;; this is not used at present, but may be used later
@@ -3858,7 +3870,8 @@ Null string will repeat previous search."
   "Repeat previous search."
   (interactive "P")
   (let ((val (viper-p-val arg))
-        (com (viper-getcom arg)))
+        (com (viper-getcom arg))
+        debug-on-error)
     (if (null viper-s-string) (error viper-NoPrevSearch))
     (viper-search viper-s-string viper-s-forward arg)
     (if com
@@ -3870,7 +3883,8 @@ Null string will repeat previous search."
   "Repeat previous search in the reverse direction."
   (interactive "P")
   (let ((val (viper-p-val arg))
-        (com (viper-getcom arg)))
+        (com (viper-getcom arg))
+        debug-on-error)
     (if (null viper-s-string) (error viper-NoPrevSearch))
     (viper-search viper-s-string (not viper-s-forward) arg)
     (if com
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 6e188f21a9d..8d9aed94770 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -855,15 +855,13 @@ Related buffers can be cycled through via :R and :P commands."
     (t (:underline t :stipple "gray3")))
   "*Face used to flash out the search pattern."
   :group 'viper-highlighting)
-;; backward-compatibility alias
-(put 'viper-search-face 'face-alias 'viper-search)
 ;; An internal variable.  Viper takes the face from here.
 (defvar viper-search-face 'viper-search
   "Face used to flash out the search pattern.
 DO NOT CHANGE this variable.  Instead, use the customization widget
-to customize the actual face object `viper-search-face'
+to customize the actual face object `viper-search'
 this variable represents.")
-(viper-hide-face 'viper-search)
+(viper-hide-face viper-search-face)
 
 
 (defface viper-replace-overlay
@@ -871,15 +869,13 @@ this variable represents.")
     (t (:underline t :stipple "gray3")))
   "*Face for highlighting replace regions on a window display."
   :group 'viper-highlighting)
-;; backward-compatibility alias
-(put 'viper-replace-overlay-face 'face-alias 'viper-replace-overlay)
 ;; An internal variable.  Viper takes the face from here.
 (defvar viper-replace-overlay-face 'viper-replace-overlay
   "Face for highlighting replace regions on a window display.
 DO NOT CHANGE this variable.  Instead, use the customization widget
-to customize the actual face object `viper-replace-overlay-face'
+to customize the actual face object `viper-replace-overlay'
 this variable represents.")
-(viper-hide-face 'viper-replace-overlay)
+(viper-hide-face viper-replace-overlay-face)
 
 
 (defface viper-minibuffer-emacs
@@ -887,15 +883,13 @@ this variable represents.")
     (t (:weight bold)))
   "Face used in the Minibuffer when it is in Emacs state."
   :group 'viper-highlighting)
-;; backward-compatibility alias
-(put 'viper-minibuffer-emacs-face 'face-alias 'viper-minibuffer-emacs)
 ;; An internal variable.  Viper takes the face from here.
 (defvar viper-minibuffer-emacs-face 'viper-minibuffer-emacs
   "Face used in the Minibuffer when it is in Emacs state.
 DO NOT CHANGE this variable.  Instead, use the customization widget
-to customize the actual face object `viper-minibuffer-emacs-face'
+to customize the actual face object `viper-minibuffer-emacs'
 this variable represents.")
-(viper-hide-face 'viper-minibuffer-emacs)
+(viper-hide-face viper-minibuffer-emacs-face)
 
 
 (defface viper-minibuffer-insert
@@ -903,15 +897,13 @@ this variable represents.")
     (t (:slant italic)))
   "Face used in the Minibuffer when it is in Insert state."
   :group 'viper-highlighting)
-;; backward-compatibility alias
-(put 'viper-minibuffer-insert-face 'face-alias 'viper-minibuffer-insert)
 ;; An internal variable.  Viper takes the face from here.
 (defvar viper-minibuffer-insert-face 'viper-minibuffer-insert
   "Face used in the Minibuffer when it is in Insert state.
 DO NOT CHANGE this variable.  Instead, use the customization widget
-to customize the actual face object `viper-minibuffer-insert-face'
+to customize the actual face object `viper-minibuffer-insert'
 this variable represents.")
-(viper-hide-face 'viper-minibuffer-insert)
+(viper-hide-face viper-minibuffer-insert-face)
 
 
 (defface viper-minibuffer-vi
@@ -919,15 +911,13 @@ this variable represents.")
     (t (:inverse-video t)))
   "Face used in the Minibuffer when it is in Vi state."
   :group 'viper-highlighting)
-;; backward-compatibility alias
-(put 'viper-minibuffer-vi-face 'face-alias 'viper-minibuffer-vi)
 ;; An internal variable.  Viper takes the face from here.
 (defvar viper-minibuffer-vi-face 'viper-minibuffer-vi
   "Face used in the Minibuffer when it is in Vi state.
 DO NOT CHANGE this variable.  Instead, use the customization widget
-to customize the actual face object `viper-minibuffer-vi-face'
+to customize the actual face object `viper-minibuffer-vi'
 this variable represents.")
-(viper-hide-face 'viper-minibuffer-vi)
+(viper-hide-face viper-minibuffer-vi-face)
 
 ;; the current face to be used in the minibuffer
 (viper-deflocalvar
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index e83cf14776f..1bbf3dce2c2 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -50,25 +50,6 @@
 
 ;;; Variables
 
-(defcustom viper-toggle-key "\C-z"
-  "The key used to change states from emacs to Vi and back.
-In insert mode, this key also functions as Meta.
-Must be set in .viper file or prior to loading Viper.
-This setting cannot be changed interactively."
-  :type 'string
-  :group 'viper)
-
-(defcustom viper-quoted-insert-key "\C-v"
-  "The key used to quote special characters when inserting them in Insert state."
-  :type 'string
-  :group 'viper)
-
-(defcustom viper-ESC-key "\e"
-  "Key used to ESC.
-Must be set in .viper file or prior to loading Viper.
-This setting cannot be changed interactively."
-  :type 'string
-  :group 'viper)
 
 ;;; Emacs keys in other states.
 
@@ -176,6 +157,78 @@ viper-insert-basic-map.  Not recommended, except for novice users.")
 ;; and, after .viper is loaded, we add this keymap to viper-vi-basic-map.
 (defvar viper-mode-map (make-sparse-keymap))
 
+;; Some important keys used in viper
+(defcustom viper-toggle-key [(control ?z)]  ; "\C-z"
+  "The key used to change states from emacs to Vi and back.
+In insert mode, this key also functions as Meta.
+
+Enter as a sexp. Examples: \"\\C-z\", [(control ?z)]."
+  :type 'sexp
+  :group 'viper
+  :set (lambda (symbol value)
+         (let ((old-value (if (boundp 'viper-toggle-key)
+                              viper-toggle-key
+                            [(control ?z)])))
+           (mapcar
+            (lambda (buf)
+              (save-excursion
+                (set-buffer buf)
+                (when (and (boundp 'viper-insert-basic-map)
+                           (keymapp viper-insert-basic-map))
+                  (when old-value
+                    (define-key viper-insert-basic-map old-value nil))
+                  (define-key viper-insert-basic-map value 'viper-escape-to-vi))
+                (when (and (boundp 'viper-vi-intercept-map)
+                           (keymapp viper-vi-intercept-map))
+                  (when old-value
+                    (define-key viper-vi-intercept-map old-value nil))
+                  (define-key
+                    viper-vi-intercept-map value 'viper-toggle-key-action))
+                (when (and (boundp 'viper-emacs-intercept-map)
+                           (keymapp viper-emacs-intercept-map))
+                  (define-key viper-emacs-intercept-map old-value nil)
+                  (define-key
+                    viper-emacs-intercept-map value 'viper-change-state-to-vi))
+                ))
+            (buffer-list))
+           (set-default symbol value)
+           )))
+
+(defcustom viper-quoted-insert-key "\C-v"
+  "The key used to quote special characters when inserting them in Insert state."
+  :type 'string
+  :group 'viper)
+
+(defcustom viper-ESC-key [(escape)]  ; "\e"
+  "Key used to ESC.
+Enter as a sexp. Examples: \"\\e\", [(escape)]."
+  :type 'sexp
+  :group 'viper
+  :set (lambda (symbol value)
+         (let ((old-value (if (boundp 'viper-ESC-key)
+                              viper-ESC-key
+                            [(escape)])))
+           (mapcar
+            (lambda (buf)
+              (save-excursion
+                (set-buffer buf)
+                (when (and (boundp 'viper-insert-intercept-map)
+                           (keymapp viper-insert-intercept-map))
+                  (when old-value
+                    (define-key viper-insert-intercept-map old-value nil))
+                  (define-key
+                    viper-insert-intercept-map value 'viper-intercept-ESC-key))
+                (when (and (boundp 'viper-vi-intercept-map)
+                           (keymapp viper-vi-intercept-map))
+                  (when old-value
+                    (define-key viper-vi-intercept-map old-value nil))
+                  (define-key
+                    viper-vi-intercept-map value 'viper-intercept-ESC-key))
+                ))
+            (buffer-list))
+           (set-default symbol value)
+           )))
+
 
 ;;; Variables used by minor modes
 
@@ -197,6 +250,10 @@ viper-insert-basic-map.  Not recommended, except for novice users.")
 ;; to its Emacs state in various major modes.
 (defvar viper-emacs-state-modifier-alist nil)
 
+;; The list of viper keymaps. Set by viper-normalize-minor-mode-map-alist
+(viper-deflocalvar viper--key-maps nil)
+(viper-deflocalvar viper--intercept-key-maps nil)
+
 ;; Tells viper-add-local-keys to create a new viper-vi-local-user-map for new
 ;; buffers.  Not a user option.
 (viper-deflocalvar viper-need-new-vi-local-map t "")
@@ -509,7 +566,7 @@ Usage:
 
 (defun viper-zap-local-keys ()
   "Unconditionally reset Viper viper-*-local-user-map's.
-Rarely useful, but if u made a mistake by switching to a mode that adds
+Rarely useful, but if you made a mistake by switching to a mode that adds
 undesirable local keys, e.g., comint-mode, then this function can restore
 sanity."
   (interactive)
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 8a3ce5db9eb..6d79ddec043 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -178,7 +178,7 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
         (if (member
              key
              '(?\b ?\d '^? '^H (control h) (control \?) backspace delete))
-            (setq key-seq (subseq key-seq 0 (- (length key-seq) 2))))
+            (setq key-seq (viper-subseq key-seq 0 (- (length key-seq) 2))))
         (setq message
               (format
                ":map%s %s"
@@ -242,9 +242,9 @@ a key is a symbol, e.g., `a', `\\1', `f2', etc., or a list, e.g.,
         (cond ((member
                 key
                 '(?\b ?\d '^? '^H (control h) (control \?) backspace delete))
-               (setq key-seq (subseq key-seq 0 (- (length key-seq) 2))))
+               (setq key-seq (viper-subseq key-seq 0 (- (length key-seq) 2))))
               ((member key '(tab (control i) ?\t))
-               (setq key-seq (subseq key-seq 0 (1- (length key-seq))))
+               (setq key-seq (viper-subseq key-seq 0 (1- (length key-seq))))
                (setq message
                      (format
                       ":unmap%s %s"
@@ -618,7 +618,7 @@ name from there."
 
     (if (null macro-alist-elt)
         (setq macro-alist-elt (car next-best-match)
-              unmatched-suffix (subseq event-seq (cdr next-best-match))))
+              unmatched-suffix (viper-subseq event-seq (cdr next-best-match))))
 
     (cond ((null macro-alist-elt))
           ((setq macro-body (viper-kbd-buf-definition macro-alist-elt)))
@@ -701,7 +701,7 @@ name from there."
   (let ((len1 (length seq1))
         (len2 (length seq2)))
     (if (<= len1 len2)
-        (equal seq1 (subseq seq2 0 len1)))))
+        (equal seq1 (viper-subseq seq2 0 len1)))))
 
 ;; find the longest common prefix
 (defun viper-common-seq-prefix (&rest seqs)
@@ -766,7 +766,7 @@ name from there."
       (setq macro-def (car lis)
             def-len (length (car macro-def)))
       (if (and (>= str-len def-len)
-               (equal (car macro-def) (subseq str 0 def-len)))
+               (equal (car macro-def) (viper-subseq str 0 def-len)))
           (if (or (viper-kbd-buf-definition macro-def)
                   (viper-kbd-mode-definition macro-def)
                   (viper-kbd-global-definition macro-def))
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 503cd145796..77c5f844567 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -65,7 +65,7 @@
 (defvar viper-frame-of-focus nil)
 
 ;; Frame that was selected before the switch-frame event.
-(defconst viper-current-frame-saved (selected-frame))
+(defvar viper-current-frame-saved (selected-frame))
 
 (defcustom viper-surrounding-word-function 'viper-surrounding-word
   "*Function that determines what constitutes a word for clicking events.
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 2d713df6ef6..d6fe9b43a64 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -41,7 +41,6 @@
 (defvar viper-syntax-preference)
 (defvar viper-saved-mark)
 
-(require 'cl)
 (require 'ring)
 
 (if noninteractive
@@ -1068,7 +1067,7 @@
                  (t key)))
 
           ((listp key)
-           (setq modifiers (subseq key 0 (1- (length key)))
+           (setq modifiers (viper-subseq key 0 (1- (length key)))
                  base-key (viper-seq-last-elt key)
                  base-key-name (symbol-name base-key)
                  char-p (= (length base-key-name) 1))
@@ -1503,6 +1502,33 @@ This option is appropriate if you like Emacs-style words."
     ))
 
 
+;; this is copied from cl-extra.el
+;; Return the subsequence of SEQ from START to END.
+;; If END is omitted, it defaults to the length of the sequence.
+;; If START or END is negative, it counts from the end.
+(defun viper-subseq (seq start &optional end)
+  (if (stringp seq) (substring seq start end)
+    (let (len)
+      (and end (< end 0) (setq end (+ end (setq len (length seq)))))
+      (if (< start 0) (setq start (+ start (or len (setq len (length seq))))))
+      (cond ((listp seq)
+             (if (> start 0) (setq seq (nthcdr start seq)))
+             (if end
+                 (let ((res nil))
+                   (while (>= (setq end (1- end)) start)
+                     (push (pop seq) res))
+                   (nreverse res))
+               (copy-sequence seq)))
+            (t
+             (or end (setq end (or len (length seq))))
+             (let ((res (make-vector (max (- end start) 0) nil))
+                   (i 0))
+               (while (< start end)
+                 (aset res i (aref seq start))
+                 (setq i (1+ i) start (1+ start)))
+               res))))))
+
+
 
 (provide 'viper-util)
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index fe65cb69cbb..3a95fa26835 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -8,7 +8,7 @@
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
 
-(defconst viper-version "3.11.4 of February 19, 2005"
+(defconst viper-version "3.11.5 of July 8, 2005"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
@@ -320,6 +320,7 @@
 ;; end pacifier
 
 (require 'viper-init)
+(require 'viper-keym)
 
 ;; better be defined before Viper custom group.
 (defvar viper-custom-file-name (convert-standard-filename "~/.viper")
@@ -691,6 +692,12 @@ remains buffer-local."
 
   (setq viper-mode nil)
 
+  (when (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
+    (setq emulation-mode-map-alists
+          (delq 'viper--intercept-key-maps
+                (delq 'viper--key-maps emulation-mode-map-alists))
+          ))
+
   (viper-delocalize-var 'viper-vi-minibuffer-minor-mode)
   (viper-delocalize-var 'viper-insert-minibuffer-minor-mode)
   (viper-delocalize-var 'viper-vi-intercept-minor-mode)
@@ -874,9 +881,27 @@ remains buffer-local."
       "Switch to emacs state while reading password."
       (viper-change-state-to-emacs)))
 
+  (defadvice self-insert-command (around viper-self-insert-ad activate)
+    "Ignore all self-inserting keys in the vi-state."
+    (if (and (eq viper-current-state 'vi-state) (interactive-p))
+        (beep 1)
+      ad-do-it
+      ))
+
+  (when (and (fboundp 'add-to-ordered-list) (boundp 'emulation-mode-map-alists))
+    ;; needs to be as early as possible
+    (add-to-ordered-list
+     'emulation-mode-map-alists 'viper--intercept-key-maps 100)
+    ;; needs to be after cua-mode
+    (add-to-ordered-list 'emulation-mode-map-alists 'viper--key-maps 500)
+    )
+
   ;; Emacs shell, ange-ftp, and comint-based modes
   (add-hook 'comint-mode-hook 'viper-comint-mode-hook) ; comint
 
+  (add-hook 'eshell-mode-hook
+            (lambda () (setq viper-auto-indent nil)))
+
   (viper-set-emacs-state-searchstyle-macros nil 'dired-mode) ; dired
   (viper-set-emacs-state-searchstyle-macros nil 'tar-mode) ; tar
   (viper-set-emacs-state-searchstyle-macros nil 'mh-folder-mode) ; mhe
@@ -1058,6 +1083,14 @@ remains buffer-local."
     (define-key viper-insert-intercept-map "\C-x)" nil)
     (define-key viper-emacs-intercept-map "\C-x)" nil))
 
+  (defadvice add-minor-mode (after
+                             viper-advice-add-minor-mode
+                             (toggle name &optional keymap after toggle-fun)
+                             activate)
+  "Run viper-normalize-minor-mode-map-alist after adding a minor mode."
+  (viper-normalize-minor-mode-map-alist)
+  (setq-default minor-mode-map-alist minor-mode-map-alist))
+
   ;; catch frame switching event
   (if (viper-window-display-p)
       (if viper-xemacs-p