[Emacs-diffs] master ae928ae 5/5: Remove som XEmacs compat code from message.el

[Lars Ingebrigtsen]

branch: master
commit ae928ae2397a58a75584aaa0037a3dc383473756
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Remove som XEmacs compat code from message.el
    
    * lisp/gnus/message.el: Remove some XEmacs compat code.
---
 lisp/gnus/mailcap.el |    6 ------
 lisp/gnus/message.el |   10 ++--------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index 85d0411..62d8b9b 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -53,12 +53,6 @@
     table)
   "A syntax table for parsing SGML attributes.")
 
-(eval-and-compile
-  (when (featurep 'xemacs)
-    (condition-case nil
-       (require 'lpr)
-      (error nil))))
-
 (defvar mailcap-print-command
   (mapconcat 'identity
             (cons (if (boundp 'lpr-command)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 3ed359b..fee7937 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -40,9 +40,7 @@
 ;; This is apparently necessary even though things are autoloaded.
 ;; Because we dynamically bind mail-abbrev-mode-regexp, we'd better
 ;; require mailabbrev here.
-(if (featurep 'xemacs)
-    (require 'mail-abbrevs)
-  (require 'mailabbrev))
+(require 'mailabbrev)
 (require 'mail-parse)
 (require 'mml)
 (require 'rfc822)
@@ -1249,11 +1247,7 @@ called and its result is inserted."
          (if (and (boundp 'mail-archive-file-name)
                   (stringp mail-archive-file-name))
              (format "FCC: %s\n" mail-archive-file-name))
-         ;; Use the value of `mail-default-headers' if available.
-         ;; Note: as for XEmacs 21.4 and 21.5, it is unavailable
-         ;; unless sendmail.el is loaded.
-         (if (boundp 'mail-default-headers)
-             mail-default-headers))
+         mail-default-headers)
   "*A string of header lines to be inserted in outgoing mails."
   :version "23.2"
   :group 'message-headers