Use (featurep 'xemacs) instead of the `gnus-xemacs' variable, as the

latter has been removed.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index bba162588bb2ba4ba55f7d45f734f5c076b5ebf0..55801cfcabbd6040fb3ff91e2ab630831d979fd2 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -874,7 +874,7 @@ See the manual for details."
 (defcustom gnus-treat-display-xface 
   (and (or (and (fboundp 'image-type-available-p)
                (image-type-available-p 'xbm))
-          (and gnus-xemacs (featurep 'xface)))
+          (and (featurep 'xemacs) (featurep 'xface)))
        'head)
   "Display X-Face headers.
 Valid values are nil, t, `head', `last', an integer or a predicate.
@@ -883,7 +883,7 @@ See the manual for details."
   :type gnus-article-treat-head-custom)
 (put 'gnus-treat-display-xface 'highlight t)
 
-(defcustom gnus-treat-display-smileys (if (and gnus-xemacs
+(defcustom gnus-treat-display-smileys (if (and (featurep 'xemacs)
                                               (featurep 'xpm))
                                          t nil)
   "Display smileys.
@@ -893,7 +893,7 @@ See the manual for details."
   :type gnus-article-treat-custom)
 (put 'gnus-treat-display-smileys 'highlight t)
 
-(defcustom gnus-treat-display-picons (if gnus-xemacs 'head nil)
+(defcustom gnus-treat-display-picons (if (featurep 'xemacs) 'head nil)
   "Display picons.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See the manual for details."
@@ -3704,7 +3704,7 @@ Argument LINES specifies lines to be scrolled down."
       (set-buffer gnus-article-current-summary)
       (let (gnus-pick-mode)
         (push (or key last-command-event) unread-command-events)
-        (setq keys (if gnus-xemacs
+        (setq keys (if (featurep 'xemacs)
                       (events-to-keys (read-key-sequence nil))
                     (read-key-sequence nil)))))
                     

diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 084fdc092d28fa829b2e1dad8c24276faf35a01a..d147132fd338756f84c7dec88dae04ec326b4419 100644 (file)
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -97,7 +97,7 @@
 
 (defun gnus-ems-redefine ()
   (cond
-   (gnus-xemacs
+   ((featurep 'xemacs)
     (gnus-xmas-redefine))
 
    ((featurep 'mule)

diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 0fcb7dd9a6dcfc1188c03624285336ea57cfb3f7..f6c1651ce2cd31b2b067f7898bfbb3f0907113ea 100644 (file)
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -679,7 +679,7 @@ prompt the user for the name of an NNTP server to use."
     (when gnus-simple-splash
       (setq gnus-simple-splash nil)
       (cond
-       (gnus-xemacs
+       ((featurep 'xemacs)
        (gnus-xmas-splash))
        ((and window-system
             (= (frame-height) (1+ (window-height))))
@@ -2628,7 +2628,7 @@ If FORCE is non-nil, the .newsrc file is read."
              (let ((str (buffer-substring
                          (point) (progn (end-of-line) (point))))
                    (coding
-                    (and (or gnus-xemacs
+                    (and (or (featurep 'xemacs)
                              (and (boundp 'enable-multibyte-characters)
                                   enable-multibyte-characters))
                          (fboundp 'gnus-mule-get-coding-system)