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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/09 05:20:59

Index: emulation/viper-ex.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/emulation/viper-ex.el,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- emulation/viper-ex.el       2 Nov 2007 06:03:11 -0000       1.63
+++ emulation/viper-ex.el       9 Nov 2007 05:20:24 -0000       1.64
@@ -1103,7 +1103,7 @@
         beg end cont val)
 
     (viper-add-keymap ex-read-filename-map
-                   (if viper-emacs-p
+                   (if (featurep 'emacs)
                        minibuffer-local-completion-map
                      read-file-name-map))
 
@@ -1558,7 +1558,7 @@
       ;; setup buffer
       (if (setq wind (viper-get-visible-buffer-window buf))
          ()
-       (setq wind (get-lru-window (if viper-xemacs-p nil 'visible)))
+       (setq wind (get-lru-window (if (featurep 'xemacs) nil 'visible)))
        (set-window-buffer wind buf))
 
       (if (viper-window-display-p)
@@ -1878,7 +1878,7 @@
   (condition-case nil
       (progn
        (pop-to-buffer (get-buffer-create "*info*"))
-       (info (if viper-xemacs-p "viper.info" "viper"))
+       (info (if (featurep 'xemacs) "viper.info" "viper"))
        (message "Type `i' to search for a specific topic"))
     (error (beep 1)
           (with-output-to-temp-buffer " *viper-info*"
@@ -1887,7 +1887,7 @@
 
 This file is part of the standard distribution of %sEmacs.
 Please contact your system administrator. "
-                           (if viper-xemacs-p "X" "")
+                           (if (featurep 'xemacs) "X" "")
                            ))))))
 
 ;; Ex source command.  Loads the file specified as argument or `~/.viper'