[Emacs-commit] emacs/lisp/mh-e mh-xface.el mh-utils.el mh-show...

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   07/11/17 17:35:08

Modified files:
        lisp/mh-e      : mh-xface.el mh-utils.el mh-show.el mh-gnus.el 
                         mh-folder.el mh-e.el mh-comp.el ChangeLog 

Log message:
        * 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).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-xface.el?cvsroot=emacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-utils.el?cvsroot=emacs&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-show.el?cvsroot=emacs&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-gnus.el?cvsroot=emacs&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-folder.el?cvsroot=emacs&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-e.el?cvsroot=emacs&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/mh-comp.el?cvsroot=emacs&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mh-e/ChangeLog?cvsroot=emacs&r1=1.257&r2=1.258

Patches:
Index: mh-xface.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-xface.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- mh-xface.el 26 Jul 2007 05:27:17 -0000      1.7
+++ mh-xface.el 17 Nov 2007 17:35:07 -0000      1.8
@@ -36,7 +36,7 @@
 (autoload 'message-fetch-field "message")
 
 (defvar mh-show-xface-function
-  (cond ((and mh-xemacs-flag (locate-library "x-face") (not (featurep 'xface)))
+  (cond ((and (featurep 'xemacs) (locate-library "x-face") (not (featurep 
'xface)))
          (load "x-face" t t)
          #'mh-face-display-function)
         ((>= emacs-major-version 21)

Index: mh-utils.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-utils.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- mh-utils.el 26 Jul 2007 05:27:17 -0000      1.68
+++ mh-utils.el 17 Nov 2007 17:35:07 -0000      1.69
@@ -67,7 +67,7 @@
 ;;;###mh-autoload
 (defun mh-colors-available-p ()
   "Check if colors are available in the Emacs being used."
-  (or mh-xemacs-flag
+  (or (featurep 'xemacs)
       (let ((color-cells (mh-display-color-cells)))
         (and (numberp color-cells) (>= color-cells 8)))))
 

Index: mh-show.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-show.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- mh-show.el  21 Aug 2007 12:13:48 -0000      1.10
+++ mh-show.el  17 Nov 2007 17:35:07 -0000      1.11
@@ -872,7 +872,7 @@
     (mh-gnus-article-highlight-citation))
    (t
     (setq font-lock-defaults '(mh-show-font-lock-keywords t))))
-  (if (and mh-xemacs-flag
+  (if (and (featurep 'xemacs)
            font-lock-auto-fontify)
       (turn-on-font-lock))
   (when mh-decode-mime-flag

Index: mh-gnus.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-gnus.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- mh-gnus.el  26 Jul 2007 05:27:16 -0000      1.19
+++ mh-gnus.el  17 Nov 2007 17:35:07 -0000      1.20
@@ -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))))
 

Index: mh-folder.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-folder.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- mh-folder.el        21 Aug 2007 12:15:22 -0000      1.17
+++ mh-folder.el        17 Nov 2007 17:35:07 -0000      1.18
@@ -351,7 +351,7 @@
   "\M-\t"       mh-prev-button)
 
 (cond
- (mh-xemacs-flag
+ ((featurep 'xemacs)
   (define-key mh-folder-mode-map [button2] 'mh-show-mouse))
  (t
   (define-key mh-folder-mode-map [mouse-2] 'mh-show-mouse)))
@@ -513,7 +513,7 @@
 
 (defmacro mh-remove-xemacs-horizontal-scrollbar ()
   "Get rid of the horizontal scrollbar that XEmacs insists on putting in."
-  (when mh-xemacs-flag
+  (when (featurep 'xemacs)
     `(if (and (featurep 'scrollbar)
               (fboundp 'set-specifier))
          (set-specifier horizontal-scrollbar-visible-p nil
@@ -656,7 +656,7 @@
   (easy-menu-add mh-folder-folder-menu)
   (mh-inc-spool-make)
   (mh-set-help mh-folder-mode-help-messages)
-  (if (and mh-xemacs-flag
+  (if (and (featurep 'xemacs)
            font-lock-auto-fontify)
       (turn-on-font-lock)))             ; Force font-lock in XEmacs.
 

Index: mh-e.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-e.el,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- mh-e.el     11 Sep 2007 04:41:39 -0000      1.114
+++ mh-e.el     17 Nov 2007 17:35:07 -0000      1.115
@@ -99,10 +99,6 @@
 (require 'mh-buffers)
 (require 'mh-compat)
 
-(eval-and-compile
-  (defvar mh-xemacs-flag (featurep 'xemacs)
-    "Non-nil means the current Emacs is XEmacs."))
-
 (mh-do-in-xemacs
   (require 'mh-xemacs))
 
@@ -3398,7 +3394,7 @@
 The :inherit keyword is available on all supported versions of
 GNU Emacs and XEmacs from at least 21.5.23 on.")
 
-(defvar mh-min-colors-defined-flag (and (not mh-xemacs-flag)
+(defvar mh-min-colors-defined-flag (and (not (featurep 'xemacs))
                                         (>= emacs-major-version 22))
   "Non-nil means `defface' supports min-colors display requirement.")
 

Index: mh-comp.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/mh-comp.el,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- mh-comp.el  25 Aug 2007 14:12:58 -0000      1.59
+++ mh-comp.el  17 Nov 2007 17:35:08 -0000      1.60
@@ -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))

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/mh-e/ChangeLog,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- ChangeLog   11 Sep 2007 04:46:49 -0000      1.257
+++ ChangeLog   17 Nov 2007 17:35:08 -0000      1.258
@@ -1,3 +1,16 @@
+2007-11-17  Dan Nicolaescu  <address@hidden>
+
+       * 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).
+
 2007-09-11  Bill Wohler  <address@hidden>
 
        * mh-e.el (Version, mh-version): Add +cvs to version.