changeset 92378:da8218af4a5d

Expand all viper-cond-compile-for-xemacs-or-emacs calls to a featurep test.
author Glenn Morris <rgm@gnu.org>
date Sat, 01 Mar 2008 20:11:47 +0000
parents 20e7f613b637
children 3b2c0edcb428
files lisp/emulation/viper.el
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emulation/viper.el	Sat Mar 01 20:11:00 2008 +0000
+++ b/lisp/emulation/viper.el	Sat Mar 01 20:11:47 2008 +0000
@@ -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."