Remove som XEmacs compat code from message.el

* lisp/gnus/message.el: Remove some XEmacs compat code.

diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index 85d0411a1e37ac7dfd4d13f76f8898c2616963a8..62d8b9be39149415c5db06bbe55b128def112d47 100644 (file)
--- 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 3ed359b123beb27e5bfcc9e90e304f0b7783f798..fee79379385f39a9f6ea0c086239568427b5c4eb 100644 (file)
--- 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