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

[Glenn Morris]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Glenn Morris <gm>       08/03/01 20:11:47

Index: viper.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emulation/viper.el,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- viper.el    28 Feb 2008 20:46:02 -0000      1.112
+++ viper.el    1 Mar 2008 20:11:47 -0000       1.113
@@ -1022,7 +1022,7 @@
       (setq global-mode-string
            (append '("" viper-mode-string) (cdr global-mode-string))))
 
-  (viper-cond-compile-for-xemacs-or-emacs
+  (if (featurep 'xemacs)
    ;; XEmacs
    (defadvice describe-key (before viper-describe-key-ad protect activate)
      "Force to read key via `viper-read-key-sequence'."
@@ -1052,9 +1052,9 @@
                                        (eventp (aref key 1))
                                        (memq 'down (event-modifiers (aref key 
1)))))
                               (read-event))))))
-   ) ; viper-cond-compile-for-xemacs-or-emacs
+   ) ; (if (featurep 'xemacs)
 
-  (viper-cond-compile-for-xemacs-or-emacs
+  (if (featurep 'xemacs)
    ;; XEmacs
    (defadvice describe-key-briefly
      (before viper-describe-key-briefly-ad protect activate)
@@ -1078,7 +1078,7 @@
                          (if current-prefix-arg
                              (prefix-numeric-value current-prefix-arg))
                          1))))
-   ) ;; viper-cond-compile-for-xemacs-or-emacs
+   ) ; (if (featurep 'xemacs)
 
   (defadvice find-file (before viper-add-suffix-advice activate)
     "Use `read-file-name' for reading arguments."