aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/emulation/viper.el14
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 82c070d5264..fd1a8aa92ea 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -359,7 +359,7 @@ user decide when to invoke Viper in a major mode."
359(defcustom viper-mode (cond (noninteractive nil) 359(defcustom viper-mode (cond (noninteractive nil)
360 (t 'ask)) 360 (t 'ask))
361 "To Viperize or not to Viperize. 361 "To Viperize or not to Viperize.
362If t, viperize emacs. If nil -- don't. If `ask', ask the user. 362If t, viperize Emacs. If nil -- don't. If `ask', ask the user.
363This variable is used primatily when Viper is being loaded. 363This variable is used primatily when Viper is being loaded.
364 364
365Must be set in `~/.emacs' before Viper is loaded. 365Must be set in `~/.emacs' before Viper is loaded.
@@ -502,10 +502,10 @@ unless it is coming up in a wrong Viper state."
502The list has the structure: ((mode viper-state keymap) (mode viper-state 502The list has the structure: ((mode viper-state keymap) (mode viper-state
503keymap) ...). If `mode' is on the list, the `kemap' will be made active (on 503keymap) ...). If `mode' is on the list, the `kemap' will be made active (on
504the minor-mode-map-alist) in the specified viper state. 504the minor-mode-map-alist) in the specified viper state.
505If you change this list, have to restart emacs for the change to take effect. 505If you change this list, have to restart Emacs for the change to take effect.
506However, if you did the change through the customization widget, then emacs 506However, if you did the change through the customization widget, then Emacs
507needs to be restarted only if you deleted a triple mode-state-keymap from the 507needs to be restarted only if you deleted a triple mode-state-keymap from the
508list. No need to restart emacs in case of insertion or modification of an 508list. No need to restart Emacs in case of insertion or modification of an
509existing triple." 509existing triple."
510 :type '(repeat 510 :type '(repeat
511 (list symbol 511 (list symbol
@@ -891,7 +891,7 @@ It also can't undo some Viper settings."
891 (eval-after-load 891 (eval-after-load
892 "passwd" 892 "passwd"
893 '(defadvice read-passwd-1 (before viper-passwd-ad activate) 893 '(defadvice read-passwd-1 (before viper-passwd-ad activate)
894 "Switch to emacs state while reading password." 894 "Switch to Emacs state while reading password."
895 (viper-change-state-to-emacs))) 895 (viper-change-state-to-emacs)))
896 896
897 (defadvice self-insert-command (around viper-self-insert-ad activate) 897 (defadvice self-insert-command (around viper-self-insert-ad activate)
@@ -939,7 +939,7 @@ It also can't undo some Viper settings."
939 (eval-after-load 939 (eval-after-load
940 "rmailedit" 940 "rmailedit"
941 '(defadvice rmail-cease-edit (after viper-rmail-advice activate) 941 '(defadvice rmail-cease-edit (after viper-rmail-advice activate)
942 "Switch to emacs state when done editing message." 942 "Switch to Emacs state when done editing message."
943 (viper-change-state-to-emacs))) 943 (viper-change-state-to-emacs)))
944 ;; In case RMAIL was loaded before Viper. 944 ;; In case RMAIL was loaded before Viper.
945 (defadvice rmail-cease-edit (after viper-rmail-advice activate) 945 (defadvice rmail-cease-edit (after viper-rmail-advice activate)
@@ -1121,7 +1121,7 @@ It also can't undo some Viper settings."
1121 (save-window-excursion 1121 (save-window-excursion
1122 (with-output-to-temp-buffer " *viper-info*" 1122 (with-output-to-temp-buffer " *viper-info*"
1123 (princ " 1123 (princ "
1124You have loaded Viper, and are about to Viperize your emacs! 1124You have loaded Viper, and are about to Viperize your Emacs!
1125 1125
1126Viper is a Package for Emacs Rebels and a venomous VI PERil, 1126Viper is a Package for Emacs Rebels and a venomous VI PERil,
1127 1127