From fdde33b8714b067da79067f0afa531f613076e3c Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 3 Mar 2006 08:39:33 +0000 Subject: [PATCH] Synch to No Gnus 200603030839. --- lisp/ChangeLog | 8 ++++++++ lisp/gnus-group.el | 8 ++++++-- lisp/gnus-sum.el | 8 ++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 574e408..5e3aa7a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,13 @@ 2006-03-03 Katsumi Yamaoka + * gnus-group.el (gnus-group-tool-bar-gnome): Check if gnus-topic.el + is loaded. + + * gnus-sum.el (gnus-summary-tool-bar-gnome): Check if spam.el is + loaded. + +2006-03-03 Katsumi Yamaoka + * mm-decode.el (mm-get-part): Don't use mm-with-unibyte-current-buffer. diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index c8f149a..b73bfbb 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1070,8 +1070,12 @@ Pre-defined symbols include `gnus-group-tool-bar-gnome' and :visible (or (not gnus-agent) gnus-plugged)) ;; FIXME: gnus-*-read-group should have a better help text. - (gnus-topic-read-group "open" nil :visible gnus-topic-mode) - (gnus-group-read-group "open" nil :visible (not gnus-topic-mode)) + (gnus-topic-read-group "open" nil + :visible (and (boundp 'gnus-topic-mode) + gnus-topic-mode)) + (gnus-group-read-group "open" nil + :visible (not (and (boundp 'gnus-topic-mode) + gnus-topic-mode))) ;; (gnus-group-find-new-groups "???" nil) (gnus-group-save-newsrc "save") (gnus-group-describe-group "describe") diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 3c6fc6d..a9b445c 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -2681,10 +2681,14 @@ Pre-defined symbols include `gnus-summary-tool-bar-gnome' and :visible (gnus-check-backend-function 'request-expire-articles gnus-newsgroup-name)) (gnus-summary-mark-as-spam - "mail/spam" t :visible (spam-group-ham-contents-p gnus-newsgroup-name) + "mail/spam" t + :visible (and (fboundp 'spam-group-ham-contents-p) + (spam-group-ham-contents-p gnus-newsgroup-name)) :help "Mark as spam") (gnus-summary-mark-as-read-forward - "mail/not-spam" nil :visible (spam-group-spam-contents-p gnus-newsgroup-name)) + "mail/not-spam" nil + :visible (and (fboundp 'spam-group-spam-contents-p) + (spam-group-spam-contents-p gnus-newsgroup-name))) ;; (gnus-summary-exit "exit") (gmm-customize-mode "preferences" t :help "Edit mode preferences") -- 1.7.10.4