diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-28 17:02:53 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-08-28 17:02:53 +0000 |
| commit | 14acf2f55e96b3d01cd4f42508313a87d01c65cf (patch) | |
| tree | 70cd72663c338877f2071ce88c562a17968afb20 /lisp/emulation/viper.el | |
| parent | 72f16325c1807f5e822c2eb76e10392630842d39 (diff) | |
| download | emacs-14acf2f55e96b3d01cd4f42508313a87d01c65cf.tar.gz emacs-14acf2f55e96b3d01cd4f42508313a87d01c65cf.tar.bz2 emacs-14acf2f55e96b3d01cd4f42508313a87d01c65cf.zip | |
* gnus/nnheader.el (nnheader-find-file-noselect):
* gnus/mm-util.el (mm-insert-file-contents):
* org/org-html.el (org-export-as-html):
* org/org-docbook.el (org-export-as-docbook):
* textmodes/reftex.el (reftex-get-file-buffer-force):
* progmodes/verilog-mode.el (verilog-batch-execute-func):
* emulation/viper.el (viper-go-away, viper-set-hooks):
* emacs-lisp/re-builder.el (re-builder-unload-function):
* emacs-lisp/bytecomp.el (byte-compile-file):
* ses.el (ses-unload-function):
* hexl.el (hexl-find-file):
* files.el (normal-mode):
* ehelp.el (with-electric-help):
* autoinsert.el (auto-insert-alist):
* arc-mode.el (archive-mode):
Use (default-value 'major-mode) instead of default-major-mode.
Diffstat (limited to 'lisp/emulation/viper.el')
| -rw-r--r-- | lisp/emulation/viper.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el index 1631b1aa6ba..2d65f5c4a06 100644 --- a/lisp/emulation/viper.el +++ b/lisp/emulation/viper.el @@ -678,8 +678,9 @@ It also can't undo some Viper settings." 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)) + (setq-default major-mode + (viper-standard-value 'default-major-mode + viper-saved-non-viper-variables)) (if (featurep 'emacs) (setq-default @@ -834,8 +835,8 @@ It also can't undo some Viper settings." ;; in Fundamental Mode and Vi state. ;; When viper-mode is executed in such a case, it will set the major mode ;; back to fundamental-mode. - (if (eq default-major-mode 'fundamental-mode) - (setq default-major-mode 'viper-mode)) + (if (eq (default-value 'major-mode) 'fundamental-mode) + (setq-default major-mode 'viper-mode)) (add-hook 'change-major-mode-hook 'viper-major-mode-change-sentinel) (add-hook 'find-file-hooks 'set-viper-state-in-major-mode) @@ -1214,7 +1215,7 @@ These two lines must come in the order given. (if (null viper-saved-non-viper-variables) (setq viper-saved-non-viper-variables (list - (cons 'default-major-mode (list default-major-mode)) + (cons 'default-major-mode (list (default-value '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)) |