[Emacs-diffs] Changes to emacs/lisp/emulation/viper.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   07/08/19 13:47:10

Index: emulation/viper.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- emulation/viper.el  26 Jul 2007 05:26:50 -0000      1.104
+++ emulation/viper.el  19 Aug 2007 13:47:07 -0000      1.105
@@ -9,7 +9,7 @@
 ;; Author: Michael Kifer <address@hidden>
 ;; Keywords: emulations
 
-(defconst viper-version "3.14 of June 14, 2007"
+(defconst viper-version "3.14 of August 18, 2007"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
@@ -646,6 +646,11 @@
         (remove-hook symbol 'viper-change-state-to-emacs)
         (remove-hook symbol 'viper-change-state-to-insert)
         (remove-hook symbol 'viper-change-state-to-vi)
+        (remove-hook symbol 'viper-minibuffer-post-command-hook)
+        (remove-hook symbol 'viper-minibuffer-setup-sentinel)
+        (remove-hook symbol 'viper-major-mode-change-sentinel)
+        (remove-hook symbol 'set-viper-state-in-major-mode)
+        (remove-hook symbol 'viper-post-command-sentinel)
         )))
 
 ;; Remove local value in all existing buffers
@@ -682,6 +687,9 @@
    global-mode-string
    (delq 'viper-mode-string global-mode-string))
 
+  (setq default-major-mode
+       (viper-standard-value 'default-major-mode 
viper-saved-non-viper-variables))
+
   (if viper-emacs-p
       (setq-default
        mark-even-if-inactive
@@ -772,9 +780,7 @@
   (mapatoms 'viper-remove-hooks)
   (remove-hook 'comint-mode-hook 'viper-comint-mode-hook)
   (remove-hook 'erc-mode-hook 'viper-comint-mode-hook)
-  (remove-hook 'minibuffer-setup-hook 'viper-minibuffer-setup-sentinel)
   (remove-hook 'change-major-mode-hook 'viper-major-mode-change-sentinel)
-  (remove-hook 'post-command-hook 'viper-minibuffer-post-command-hook)
 
   ;; unbind Viper mouse bindings
   (viper-unbind-mouse-search-key)
@@ -1214,6 +1220,7 @@
 (if (null viper-saved-non-viper-variables)
     (setq viper-saved-non-viper-variables
          (list
+          (cons 'default-major-mode (list default-major-mode))
           (cons 'next-line-add-newlines (list next-line-add-newlines))
           (cons 'require-final-newline (list require-final-newline))
           (cons 'scroll-step (list scroll-step))