From: Glenn Morris <rgm@gnu.org>
Date: Sat, 1 Mar 2008 20:11:47 +0000 (+0000)
Subject: Expand all viper-cond-compile-for-xemacs-or-emacs calls to a featurep test.
X-Git-Tag: emacs-pretest-23.0.90~7536
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e52cd136878e49197d27ff1c60fa6d6d82d1c80;p=emacs.git

Expand all viper-cond-compile-for-xemacs-or-emacs calls to a featurep test.
---

diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index ee68f868567..0ca83ae6ec0 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -1022,7 +1022,7 @@ It also can't undo some Viper settings."
       (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 @@ It also can't undo some Viper settings."
 					(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 @@ It also can't undo some Viper settings."
 			  (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."