diff lisp/mh-e/mh-comp.el @ 86202:794e428cd497

* eshell/esh-util.el (eshell-under-xemacs-p): Remove. * eshell/esh-mode.el (eshell-mode-syntax-table) (command-running-p): * eshell/esh-ext.el (eshell-external-command): * eshell/esh-cmd.el (require): * eshell/em-unix.el (eshell-plain-locate-behavior): * eshell/em-cmpl.el (eshell-cmpl-initialize): Replace eshell-under-xemacs-p with (featurep 'xemacs). * eshell/esh-mode.el (characterp,char-int): Remove unused conditional defaliases. * pcomplete.el (pcomplete-event-matches-key-specifier-p): Rename from event-matches-key-specifier-p, define unconditionally. (event-basic-type): Remove unused defalias. (pcomplete-show-completions): Use pcomplete-event-matches-key-specifier-p. * mh-e.el (mh-xemacs-flag): Remove. (mh-min-colors-defined-flag): * mh-xface.el (mh-show-xface-function): * mh-utils.el (mh-colors-available-p): * mh-show.el (mh-show-mode): * mh-gnus.el (mh-gnus-local-map-property): * mh-folder.el (mh-folder-mode-map) (mh-remove-xemacs-horizontal-scrollbar, mh-folder-mode): * mh-comp.el (mh-insert-x-mailer): Replace uses of mh-xemacs-flag with (featurep 'xemacs).

--- a/lisp/mh-e/mh-comp.el	Sat Nov 17 12:02:32 2007 +0000
+++ b/lisp/mh-e/mh-comp.el	Sat Nov 17 17:35:09 2007 +0000
@@ -928,8 +928,8 @@
     (setq mh-x-mailer-string
           (format "MH-E %s; %s; %sEmacs %s"
                   mh-version mh-variant-in-use
-                  (if mh-xemacs-flag "X" "GNU ")
-                  (cond ((not mh-xemacs-flag)
+                  (if (featurep 'xemacs) "X" "GNU ")
+                  (cond ((not (featurep 'xemacs))
                          (string-match "[0-9]+\\.[0-9]+\\(\\.[0-9]+\\)?"
                                        emacs-version)
                          (match-string 0 emacs-version))