* 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).

1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 0624346ca05..e099c2e726b 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -41,7 +41,7 @@
 ;; Copy of function from gnus-util.el.
 (defun-mh mh-gnus-local-map-property gnus-local-map-property (map)
   "Return a list suitable for a text property list specifying keymap MAP."
-  (cond (mh-xemacs-flag (list 'keymap map))
+  (cond ((featurep 'xemacs) (list 'keymap map))
         ((>= emacs-major-version 21) (list 'keymap map))
         (t (list 'local-map map))))