* gnus-xmas.el (gnus-xmas-image-type-available-p): Assume that

	image is not available if window-system is not available.

	* gnus-sum.el (gnus-summary-display-make-predicate): Add unread.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5184862..7aa0d1e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-02-12  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-xmas.el (gnus-xmas-image-type-available-p): Assume that
+       image is not available if window-system is not available.
+
+       * gnus-sum.el (gnus-summary-display-make-predicate): Add unread.
+
 2002-02-11  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus.el (gnus-article-unpropagated-mark-lists): Don't propagate

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 6f1c523..313645c 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -4813,8 +4813,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
   (when (= (length display) 1)
     (setq display (car display)))
   (unless gnus-summary-display-cache
-    (dolist (elem (append (list (cons 'read 'read)
-                               (cons 'unseen 'unseen))
+    (dolist (elem (append '((unread . unread)
+                           (unseen . unseen))
                          gnus-article-mark-lists))
       (push (cons (cdr elem)
                  (gnus-byte-compile

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index ca61793..e813164 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -794,9 +794,8 @@ XEmacs compatibility workaround."
                      gnus-mailing-list-menu))
 
 (defun gnus-xmas-image-type-available-p (type)
-  (when (eq type 'pbm)
-    (setq type 'xbm))
-  (featurep type))
+  (and window-system
+       (featurep (if (eq type 'pmb) 'xbm type))))
 
 (defun gnus-xmas-create-image (file &optional type data-p &rest props)
   (let ((type (if type