[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog emulation/viper.el
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog emulation/viper.el |
Date: |
Sat, 14 Nov 2009 04:37:03 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 09/11/14 04:37:03
Modified files:
lisp : ChangeLog
lisp/emulation : viper.el
Log message:
(viper-set-hooks): Remove duplicate advice statements for vc-diff,
emerge-quit, and rmail-cease-edit. If they are already loaded,
eval-after-load will do the right thing.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16625&r2=1.16626
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emulation/viper.el?cvsroot=emacs&r1=1.125&r2=1.126
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16625
retrieving revision 1.16626
diff -u -b -r1.16625 -r1.16626
--- ChangeLog 14 Nov 2009 04:31:52 -0000 1.16625
+++ ChangeLog 14 Nov 2009 04:37:00 -0000 1.16626
@@ -1,5 +1,9 @@
2009-11-14 Glenn Morris <address@hidden>
+ * emulation/viper.el (viper-set-hooks): Remove duplicate advice
+ statements for vc-diff, emerge-quit, and rmail-cease-edit.
+ If they are already loaded, eval-after-load will do the right thing.
+
* speedbar.el (top-level): Remove unnecessary load of ange-ftp when
compiling.
Index: emulation/viper.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- emulation/viper.el 3 Nov 2009 02:04:34 -0000 1.125
+++ emulation/viper.el 14 Nov 2009 04:37:03 -0000 1.126
@@ -866,25 +866,17 @@
))
;; Tell vc-diff to put *vc* in Vi mode
- (if (featurep 'vc)
- (defadvice vc-diff (after viper-vc-ad activate)
- "Force Vi state in VC diff buffer."
- (viper-change-state-to-vi))
(eval-after-load
"vc"
'(defadvice vc-diff (after viper-vc-ad activate)
"Force Vi state in VC diff buffer."
- (viper-change-state-to-vi))))
+ (viper-change-state-to-vi)))
(eval-after-load
"emerge"
'(defadvice emerge-quit (after viper-emerge-advice activate)
"Run `viper-change-state-to-vi' after quitting emerge."
(viper-change-state-to-vi)))
- ;; In case Emerge was loaded before Viper.
- (defadvice emerge-quit (after viper-emerge-advice activate)
- "Run `viper-change-state-to-vi' after quitting emerge."
- (viper-change-state-to-vi))
;; passwd.el sets up its own buffer, which turns up in Vi mode,
;; thus overriding the local map. We don't need Vi mode here.
@@ -943,10 +935,6 @@
'(defadvice rmail-cease-edit (after viper-rmail-advice activate)
"Switch to Emacs state when done editing message."
(viper-change-state-to-emacs)))
- ;; In case RMAIL was loaded before Viper.
- (defadvice rmail-cease-edit (after viper-rmail-advice activate)
- "Switch to emacs state when done editing message."
- (viper-change-state-to-emacs))
;; ISO accents
;; Need to do it after loading iso-acc, or else this loading will wipe out
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog emulation/viper.el,
Glenn Morris <=