8 files changed, 22 insertions, 87 deletions

diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index eb7d0f87155..1d4b021d7fa 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -93,10 +93,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
 
 (defun gnus-demon-idle-since ()
   "Return the number of seconds since when Emacs is idle."
-  (if (featurep 'xemacs)
-      (itimer-time-difference (current-time) last-command-event-time)
-    (float-time (or (current-idle-time)
-                    '(0 0 0)))))
+  (float-time (or (current-idle-time) '(0 0 0))))
 
 (defun gnus-demon-run-callback (func &optional idle time special)
   "Run FUNC if Emacs has been idle for longer than IDLE seconds.
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 3bbd4de1fe0..f7eae94a7d8 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -38,9 +38,6 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (require 'easy-mmode))) ; for `define-minor-mode'
 (require 'dired)
 (autoload 'mml-attach-file "mml")
 (autoload 'mm-default-file-encoding "mm-decode");; Shift this to `mailcap.el'?
@@ -86,12 +83,6 @@ See `mail-user-agent' for more information."
                                gnus-user-agent)
                 (function :tag "Other")))
 
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (defvar gnus-dired-mode-hook)
-    (defvar gnus-dired-mode-on-hook)
-    (defvar gnus-dired-mode-off-hook)))
-
 (define-minor-mode gnus-dired-mode
   "Minor mode for intersections of gnus and dired.
 
@@ -134,9 +125,7 @@ filenames."
           (mapcar
            ;; don't attach directories
            (lambda (f) (if (file-directory-p f) nil f))
-           (nreverse
-            (let ((arg nil)) ;; Silence XEmacs 21.5 when compiling.
-              (dired-map-over-marks (dired-get-filename) arg)))))))
+           (nreverse (dired-map-over-marks (dired-get-filename) nil))))))
   (let ((destination nil)
         (files-str nil)
         (bufs nil))
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index b5b17ba42b0..7a52266544c 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -31,9 +31,6 @@
 (require 'nndraft)
 (require 'gnus-agent)
 (eval-when-compile (require 'cl))
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (require 'easy-mmode))) ; for `define-minor-mode'
 
 ;;; Draft minor mode
 
diff --git a/lisp/gnus/gnus-gravatar.el b/lisp/gnus/gnus-gravatar.el
index de7203d9d10..77fce259b4b 100644
--- a/lisp/gnus/gnus-gravatar.el
+++ b/lisp/gnus/gnus-gravatar.el
@@ -110,8 +110,7 @@ Set image category to CATEGORY."
                 ;; another mail with the same someaddress.
                 (unless (memq 'gnus-gravatar (text-properties-at (point)))
                   (let ((point (point)))
-                    (unless (featurep 'xemacs)
-                      (setq gravatar (append gravatar gnus-gravatar-properties)))
+                    (setq gravatar (append gravatar gnus-gravatar-properties))
                     (gnus-put-image gravatar (buffer-substring (point) (1+ point)) category)
                     (put-text-property point (point) 'gnus-gravatar address)
                     (gnus-add-wash-type category)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index f66d9cef22a..838e7470856 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -223,11 +223,6 @@ with some simple extensions:
   :group 'gnus-group-visual
   :type 'string)
 
-;; Extracted from gnus-xmas-redefine in order to preserve user settings
-(when (featurep 'xemacs)
-  (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add)
-  (add-hook 'gnus-group-mode-hook 'gnus-xmas-setup-group-toolbar))
-
 (defcustom gnus-group-menu-hook nil
   "Hook run after the creation of the group mode menu."
   :group 'gnus-group-various
@@ -534,10 +529,7 @@ simple manner.")
     (?O gnus-tmp-moderated-string ?s)
     (?p gnus-tmp-process-marked ?c)
     (?s gnus-tmp-news-server ?s)
-    (?n ,(if (featurep 'xemacs)
-             '(symbol-name gnus-tmp-news-method)
-           'gnus-tmp-news-method)
-        ?s)
+    (?n gnus-tmp-news-method ?s)
     (?P gnus-group-indentation ?s)
     (?E gnus-tmp-group-icon ?s)
     (?B gnus-tmp-summary-live ?c)
@@ -797,32 +789,26 @@ simple manner.")
        ["Catch up" gnus-group-catchup-current
         :included (not (gnus-topic-mode-p))
         :active (gnus-group-group-name)
-        ,@(if (featurep 'xemacs) nil
-            '(:help "Mark unread articles in the current group as read"))]
+        :help "Mark unread articles in the current group as read"]
        ["Catch up " gnus-topic-catchup-articles
         :included (gnus-topic-mode-p)
-        ,@(if (featurep 'xemacs) nil
-            '(:help "Mark unread articles in the current group or topic as read"))]
+        :help "Mark unread articles in the current group or topic as read"]
        ["Catch up all articles" gnus-group-catchup-current-all
         (gnus-group-group-name)]
        ["Check for new articles" gnus-group-get-new-news-this-group
         :included (not (gnus-topic-mode-p))
         :active (gnus-group-group-name)
-        ,@(if (featurep 'xemacs) nil
-            '(:help "Check for new messages in current group"))]
+        :help "Check for new messages in current group"]
        ["Check for new articles " gnus-topic-get-new-news-this-topic
         :included (gnus-topic-mode-p)
-        ,@(if (featurep 'xemacs) nil
-            '(:help "Check for new messages in current group or topic"))]
+        :help "Check for new messages in current group or topic"]
        ["Toggle subscription" gnus-group-unsubscribe-current-group
         (gnus-group-group-name)]
        ["Kill" gnus-group-kill-group :active (gnus-group-group-name)
-        ,@(if (featurep 'xemacs) nil
-              '(:help "Kill (remove) current group"))]
+        :help "Kill (remove) current group"]
        ["Yank" gnus-group-yank-group gnus-list-of-killed-groups]
        ["Describe" gnus-group-describe-group :active (gnus-group-group-name)
-        ,@(if (featurep 'xemacs) nil
-            '(:help "Display description of the current group"))]
+        :help "Display description of the current group"]
        ;; Actually one should check, if any of the marked groups gives t for
        ;; (gnus-check-backend-function 'request-expire-articles ...)
        ["Expire articles" gnus-group-expire-articles
@@ -959,13 +945,9 @@ simple manner.")
        ["Send a message (mail or news)" gnus-group-post-news t]
        ["Create a local message" gnus-group-news t]
        ["Check for new news" gnus-group-get-new-news
-        ,@(if (featurep 'xemacs) '(t)
-            '(:help "Get newly arrived articles"))
-        ]
+        :help "Get newly arrived articles"]
        ["Send queued messages" gnus-delay-send-queue
-        ,@(if (featurep 'xemacs) '(t)
-            '(:help "Send all messages that are scheduled to be sent now"))
-        ]
+        :help "Send all messages that are scheduled to be sent now"]
        ["Activate all groups" gnus-activate-all-groups t]
        ["Restart Gnus" gnus-group-restart t]
        ["Read init file" gnus-group-read-init-file t]
@@ -980,9 +962,7 @@ simple manner.")
        ["Flush score cache" gnus-score-flush-cache t]
        ["Toggle topics" gnus-topic-mode t]
        ["Send a bug report" gnus-bug t]
-       ["Exit from Gnus" gnus-group-exit
-        ,@(if (featurep 'xemacs) '(t)
-            '(:help "Quit reading news"))]
+       ["Exit from Gnus" gnus-group-exit :help "Quit reading news"]
        ["Exit without saving" gnus-group-quit t]))
 
     (gnus-run-hooks 'gnus-group-menu-hook)))
@@ -1100,8 +1080,7 @@ See `gmm-tool-bar-from-list' for the format of the list."
 (defun gnus-group-make-tool-bar (&optional force)
   "Make a group mode tool bar from `gnus-group-tool-bar'.
 When FORCE, rebuild the tool bar."
-  (when (and (not (featurep 'xemacs))
-             (boundp 'tool-bar-mode)
+  (when (and (boundp 'tool-bar-mode)
              tool-bar-mode
              (display-graphic-p)
              (or (not gnus-group-tool-bar-map) force))
@@ -1510,8 +1489,7 @@ if it is a string, only list groups matching REGEXP."
 ;; Message-ID: <v9acdmrcse.fsf@marauder.physik.uni-ulm.de>
 
 (defcustom gnus-group-update-tool-bar
-  (and (not (featurep 'xemacs))
-       (boundp 'tool-bar-mode)
+  (and (boundp 'tool-bar-mode)
        tool-bar-mode
        ;; Using `redraw-frame' (see `gnus-tool-bar-update') in Emacs might
        ;; be confusing, so maybe we shouldn't call it by default.
@@ -4673,14 +4651,10 @@ This command may read the active file."
         (gnus-group-list-mode gnus-group-list-mode) ;; Save it.
         func)
     (push last-command-event unread-command-events)
-    (if (featurep 'xemacs)
-        (push (make-event 'key-press '(key ?A)) unread-command-events)
-      (push ?A unread-command-events))
+    (push ?A unread-command-events)
     (let (gnus-pick-mode keys)
-      (setq keys (if (featurep 'xemacs)
-                     (events-to-keys (read-key-sequence nil))
-                   (read-key-sequence nil)))
-      (setq func (lookup-key (current-local-map) keys)))
+      (setq keys (read-key-sequence nil)
+            func (lookup-key (current-local-map) keys)))
     (if (or (not func)
             (numberp func))
         (ding)
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index 9413d4e1b2a..23b8836ac7c 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -39,7 +39,7 @@
 (require 'xml)
 (require 'browse-url)
 (require 'mm-util)
-(eval-and-compile (unless (featurep 'xemacs) (require 'help-fns)))
+(require 'help-fns)
 
 (defcustom gnus-html-image-cache-ttl (days-to-time 7)
   "Time used to determine if we should use images from the cache."
@@ -454,10 +454,7 @@ Return a string with image data."
         (let* ((image
                 (ignore-errors
                   (gnus-create-image data nil t)))
-               (size (and image
-                          (if (featurep 'xemacs)
-                              (cons (glyph-width image) (glyph-height image))
-                            (image-size image t)))))
+               (size (and image (image-size image t))))
           (save-excursion
             (goto-char start)
             (let ((alt-text (or alt-text
@@ -466,16 +463,8 @@ Return a string with image data."
               (if (and image
                        ;; Kludge to avoid displaying 30x30 gif images, which
                        ;; seems to be a signal of a broken image.
-                       (not (and (if (featurep 'xemacs)
-                                     (glyphp image)
-                                   (listp image))
-                                 (eq (if (featurep 'xemacs)
-                                         (let ((d (cdadar
-                                                   (specifier-spec-list
-                                                    (glyph-image image)))))
-                                           (and (vectorp d)
-                                                (aref d 0)))
-                                       (plist-get (cdr image) :type))
+                       (not (and (listp image)
+                                 (eq (plist-get (cdr image) :type)
                                      'gif)
                                  (= (car size) 30)
                                  (= (cdr size) 30))))
diff --git a/lisp/gnus/gnus-ml.el b/lisp/gnus/gnus-ml.el
index 8ff36160f09..97bbab41fd1 100644
--- a/lisp/gnus/gnus-ml.el
+++ b/lisp/gnus/gnus-ml.el
@@ -29,9 +29,6 @@
 (require 'gnus)
 (require 'gnus-msg)
 (eval-when-compile (require 'cl))
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (require 'easy-mmode))) ; for `define-minor-mode'
 
 ;;; Mailing list minor mode
 
@@ -84,12 +81,6 @@ If FORCE is non-nil, replace the old ones."
           (gnus-mailing-list-mode 1))
       (gnus-message 1 "no list-post in this message."))))
 
-(eval-when-compile
-  (when (featurep 'xemacs)
-    (defvar gnus-mailing-list-mode-hook)
-    (defvar gnus-mailing-list-mode-on-hook)
-    (defvar gnus-mailing-list-mode-off-hook)))
-
 ;;;###autoload
 (define-minor-mode gnus-mailing-list-mode
   "Minor mode for providing mailing-list commands.
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index bbbe0eded4e..1b0acd24030 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -81,7 +81,6 @@ Some people may want to add \"unknown\" to this list."
   "How should picons be displayed.
 If `inline', the textual representation is replaced.  If `right', picons are
 added right to the textual representation."
-  ;; FIXME: `right' needs improvement for XEmacs.
   :type '(choice (const inline)
                  (const right))
   :group 'gnus-picon)