summaryrefslogtreecommitdiff
path: root/lisp/emulation
diff options
context:
space:
mode:
authorMichael Kifer <kifer@cs.stonybrook.edu>2001-01-19 07:13:03 +0000
committerMichael Kifer <kifer@cs.stonybrook.edu>2001-01-19 07:13:03 +0000
commit2550055a67cc37c4ed14b510b8cb4d70a9d73819 (patch)
tree5d31162f55eb2a74375c523f1eac9d0f3cadf4f6 /lisp/emulation
parentd26b89b8119a012726fd16f0660d54cf65a2e8bc (diff)
downloademacs-2550055a67cc37c4ed14b510b8cb4d70a9d73819.tar.gz
2001-01-19 Michael Kifer <kifer@cs.sunysb.edu>
* viper.el: call initial-major-mode on startup. * ediff.el (ediff-patch-file): use better defaults. * ediff-vers.el: fix for 8+3 DOS file systems 2001-01-19 Colin Walters <walters@cis.ohio-state.edu> * ediff-util.el (ediff-compare-custom-diffs-maybe): put diff in diff mode, if available. 2001-01-19 Vin Shelton <acs@xemacs.org> * ediff-hook.el (ediff-xemacs-init-menus): fixed add-menu-button 2001-01-19 Steve Youngs <youngs@xemacs.org> * ediff-init.el (subst-char-in-string): Define and use it, unless it's already defined.
Diffstat (limited to 'lisp/emulation')
-rw-r--r--lisp/emulation/viper.el14
1 files changed, 11 insertions, 3 deletions
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 21db6b0d5b9..730deb41fc5 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -8,7 +8,7 @@
;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
-(defconst viper-version "3.09 of October 29, 2000"
+(defconst viper-version "3.09 of January 19, 2001"
"The current version of Viper")
;; This file is part of GNU Emacs.
@@ -1248,8 +1248,8 @@ These two lines must come in the order given.
(and (< viper-expert-level 5) (> viper-expert-level 0))))
(viper-set-hooks))
-;; Let all minor modes take effect after loading
-;; this may not be enough, so we also set default minor-mode-alist.
+;; Let all minor modes take effect after loading.
+;; This may not be enough, so we also set default minor-mode-alist.
;; Without setting the default, new buffers that come up in emacs mode have
;; minor-mode-map-alist = nil, unless we call viper-change-state-*
(if (and viper-mode (eq viper-current-state 'emacs-state))
@@ -1261,6 +1261,14 @@ These two lines must come in the order given.
(if (and viper-mode (memq major-mode viper-vi-state-mode-list))
(viper-mode))
+(if viper-mode
+ (setq initial-major-mode
+ `(lambda ()
+ (funcall (quote ,initial-major-mode))
+ (set-viper-state-in-major-mode))
+ ))
+
+
(run-hooks 'viper-load-hook) ; the last chance to change something