# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1204402307 0
# Node ID da8218af4a5d3729d9767a7ebb0eb75298b8e2dd
# Parent  20e7f613b63727aa2eccb900e8ee393c66f481a6
Expand all viper-cond-compile-for-xemacs-or-emacs calls to a featurep test.

diff -r 20e7f613b637 -r da8218af4a5d lisp/emulation/viper.el
--- 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."