From 4ddf0e64941018634f6133cc6e113c7b7dfdfea8 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 27 Oct 2000 01:36:40 +0000 Subject: [PATCH] Use (featurep 'xemacs) instead of the `gnus-xemacs' variable, as the latter has been removed. --- lisp/gnus/gnus-art.el | 8 ++++---- lisp/gnus/gnus-ems.el | 2 +- lisp/gnus/gnus-start.el | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index bba162588bb..55801cfcabb 100644 --- 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 084fdc092d2..d147132fd33 100644 --- 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 0fcb7dd9a6d..f6c1651ce2c 100644 --- 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)