From ff31d7341a66d4c705c0380b9797bd905417bd2e Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 6 Jun 2000 21:59:22 +0000 Subject: [PATCH] Sync with Gnus. --- lisp/ChangeLog | 7 +++++++ lisp/gnus-topic.el | 25 +++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 02ccf8a..920ec09 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2000-06-06 13:28:53 Shenghuo ZHU + + * gnus-topic.el (gnus-topic-remove-topic): Set hidden. + (gnus-topic-insert-topic-line): Use shownp. + (gnus-topic-hide-topic): Don't use hidden. + (gnus-topic-show-topic): Don't use hidden. + 2000-06-05 22:25:12 Shenghuo ZHU * gnus-cache.el (gnus-cache-possibly-enter-article): Bind coding diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el index 852f2a7..43a3c18 100644 --- a/lisp/gnus-topic.el +++ b/lisp/gnus-topic.el @@ -506,7 +506,7 @@ articles in the topic and its subtopics." (let ((data (cadr (gnus-topic-find-topology topic)))) (setcdr data (list (if insert 'visible 'invisible) - (if hide 'hide nil) + hide (cadddr data)))) (if total-remove (setq gnus-topic-alist @@ -545,15 +545,16 @@ articles in the topic and its subtopics." (gnus-topic-update-unreads name unread) (beginning-of-line) ;; Insert the text. - (gnus-add-text-properties - (point) - (prog1 (1+ (point)) - (eval gnus-topic-line-format-spec)) - (list 'gnus-topic (intern name) - 'gnus-topic-level level - 'gnus-topic-unread unread - 'gnus-active active-topic - 'gnus-topic-visible visiblep)))) + (if shownp + (gnus-add-text-properties + (point) + (prog1 (1+ (point)) + (eval gnus-topic-line-format-spec)) + (list 'gnus-topic (intern name) + 'gnus-topic-level level + 'gnus-topic-unread unread + 'gnus-active active-topic + 'gnus-topic-visible visiblep))))) (defun gnus-topic-update-unreads (topic unreads) (setq gnus-topic-unreads (delq (assoc topic gnus-topic-unreads) @@ -1261,13 +1262,13 @@ If COPYP, copy the groups instead." (interactive) (when (gnus-current-topic) (gnus-topic-goto-topic (gnus-current-topic)) - (gnus-topic-remove-topic nil nil 'hidden))) + (gnus-topic-remove-topic nil nil))) (defun gnus-topic-show-topic () "Show the hidden topic." (interactive) (when (gnus-group-topic-p) - (gnus-topic-remove-topic t nil 'shown))) + (gnus-topic-remove-topic t nil))) (defun gnus-topic-mark-topic (topic &optional unmark) "Mark all groups in the topic with the process mark." -- 1.7.10.4