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

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   07/06/14 18:10:46

Index: lisp/emulation/viper.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- lisp/emulation/viper.el     12 Jun 2007 19:20:24 -0000      1.102
+++ lisp/emulation/viper.el     14 Jun 2007 18:10:45 -0000      1.103
@@ -9,7 +9,7 @@
 ;; Author: Michael Kifer <address@hidden>
 ;; Keywords: emulations
 
-(defconst viper-version "3.13.1 of October 23, 2006"
+(defconst viper-version "3.14 of June 14, 2007"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.
@@ -1026,6 +1026,12 @@
       (setq global-mode-string
            (append '("" viper-mode-string) (cdr global-mode-string))))
 
+  (viper-cond-compile-for-xemacs-or-emacs
+   ;; XEmacs
+   (defadvice describe-key (before viper-describe-key-ad protect activate)
+     "Force to read key via `viper-read-key-sequence'."
+     (interactive (list (viper-read-key-sequence "Describe key: "))))
+   ;; Emacs
   (defadvice describe-key (before viper-describe-key-ad protect activate)
     "Force to read key via `viper-read-key-sequence'."
     (interactive (let (key)
@@ -1043,14 +1049,22 @@
                              (or (and (eventp (aref key 0))
                                       (memq 'down (event-modifiers
                                                    (aref key 0)))
-                                      ;; For the C-down-mouse-2 popup
-                                      ;; menu, there is no subsequent up-event.
+                                       ;; For the C-down-mouse-2 popup menu,
+                                       ;; there is no subsequent up-event
                                       (= (length key) 1))
                                  (and (> (length key) 1)
                                       (eventp (aref key 1))
                                       (memq 'down (event-modifiers (aref key 
1)))))
                              (read-event))))))
+   ) ; viper-cond-compile-for-xemacs-or-emacs
 
+  (viper-cond-compile-for-xemacs-or-emacs
+   ;; XEmacs
+   (defadvice describe-key-briefly
+     (before viper-describe-key-briefly-ad protect activate)
+     "Force to read key via `viper-read-key-sequence'."
+     (interactive (list (viper-read-key-sequence "Describe key briefly: "))))
+   ;; Emacs
   (defadvice describe-key-briefly
     (before viper-describe-key-briefly-ad protect activate)
     "Force to read key via `viper-read-key-sequence'."
@@ -1068,6 +1082,7 @@
                         (if current-prefix-arg
                             (prefix-numeric-value current-prefix-arg))
                         1))))
+   ) ;; viper-cond-compile-for-xemacs-or-emacs
 
   (defadvice find-file (before viper-add-suffix-advice activate)
     "Use `read-file-name' for reading arguments."