comparison lisp/emulation/viper-init.el @ 91073:4bc33ffdda1a

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 902-908) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 131-137) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 261-262) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author Miles Bader <miles@gnu.org>
date Sat, 27 Oct 2007 09:12:07 +0000
parents f55f9811f5d7 f873840f9fea
children 880960b70474
comparison
equal deleted inserted replaced
91072:74ab3ea909f9 91073:4bc33ffdda1a
48 (defun viper-version () 48 (defun viper-version ()
49 (interactive) 49 (interactive)
50 (message "Viper version is %s" viper-version)) 50 (message "Viper version is %s" viper-version))
51 51
52 ;; Is it XEmacs? 52 ;; Is it XEmacs?
53 (defconst viper-xemacs-p (string-match "XEmacs" emacs-version)) 53 (defconst viper-xemacs-p (featurep 'xemacs))
54 ;; Is it Emacs? 54 ;; Is it Emacs?
55 (defconst viper-emacs-p (not viper-xemacs-p)) 55 (defconst viper-emacs-p (not viper-xemacs-p))
56 ;; Tell whether we are running as a window application or on a TTY 56 ;; Tell whether we are running as a window application or on a TTY
57 57
58 ;; This is used to avoid compilation warnings. When emacs/xemacs forms can 58 ;; This is used to avoid compilation warnings. When emacs/xemacs forms can
59 ;; generate compile time warnings, we use this macro. 59 ;; generate compile time warnings, we use this macro.
60 ;; In this case, the macro will expand into the form that is appropriate to the 60 ;; In this case, the macro will expand into the form that is appropriate to the
61 ;; compiler at hand. 61 ;; compiler at hand.
62 ;; Suggested by rms. 62 ;; Suggested by rms.
63 (defmacro viper-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form) 63 (defmacro viper-cond-compile-for-xemacs-or-emacs (xemacs-form emacs-form)
64 (if (string-match "XEmacs" emacs-version) 64 (if (featurep 'xemacs)
65 xemacs-form emacs-form)) 65 xemacs-form emacs-form))
66 66
67 67
68 (defsubst viper-device-type () 68 (defsubst viper-device-type ()
69 (viper-cond-compile-for-xemacs-or-emacs 69 (viper-cond-compile-for-xemacs-or-emacs