aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/gnus-topic.el21
1 files changed, 10 insertions, 11 deletions
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 7c6e1098100..b9897832517 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -508,7 +508,6 @@ articles in the topic and its subtopics."
508 (all-entries entries) 508 (all-entries entries)
509 (point-max (point-max)) 509 (point-max (point-max))
510 (unread 0) 510 (unread 0)
511 (topic (car type))
512 info entry end active tick) 511 info entry end active tick)
513 ;; Insert any sub-topics. 512 ;; Insert any sub-topics.
514 (while topicl 513 (while topicl
@@ -586,7 +585,7 @@ articles in the topic and its subtopics."
586 (goto-char end) 585 (goto-char end)
587 unread)) 586 unread))
588 587
589(defun gnus-topic-remove-topic (&optional insert total-remove hide in-level) 588(defun gnus-topic-remove-topic (&optional insert total-remove _hide in-level)
590 "Remove the current topic." 589 "Remove the current topic."
591 (let ((topic (gnus-group-topic-name)) 590 (let ((topic (gnus-group-topic-name))
592 (level (gnus-group-topic-level)) 591 (level (gnus-group-topic-level))
@@ -631,6 +630,8 @@ articles in the topic and its subtopics."
631 (or insert (not (gnus-topic-visible-p))) nil nil 9) 630 (or insert (not (gnus-topic-visible-p))) nil nil 9)
632 (gnus-topic-enter-dribble))))))) 631 (gnus-topic-enter-dribble)))))))
633 632
633(defvar gnus-tmp-header)
634
634(defun gnus-topic-insert-topic-line (name visiblep shownp level entries 635(defun gnus-topic-insert-topic-line (name visiblep shownp level entries
635 &optional unread) 636 &optional unread)
636 (let* ((visible (if visiblep "" "...")) 637 (let* ((visible (if visiblep "" "..."))
@@ -694,8 +695,7 @@ articles in the topic and its subtopics."
694 (let* ((topic (gnus-group-topic group)) 695 (let* ((topic (gnus-group-topic group))
695 (groups (cdr (assoc topic gnus-topic-alist))) 696 (groups (cdr (assoc topic gnus-topic-alist)))
696 (g (cdr (member group groups))) 697 (g (cdr (member group groups)))
697 (unfound t) 698 (unfound t))
698 entry)
699 ;; Try to jump to a visible group. 699 ;; Try to jump to a visible group.
700 (while (and g 700 (while (and g
701 (not (gnus-group-goto-group (car g) t))) 701 (not (gnus-group-goto-group (car g) t)))
@@ -1454,7 +1454,7 @@ If NON-RECURSIVE (which is the prefix) is t, don't mark its subtopics."
1454 (funcall (if unmark 'gnus-group-remove-mark 'gnus-group-set-mark) 1454 (funcall (if unmark 'gnus-group-remove-mark 'gnus-group-set-mark)
1455 (gnus-info-group (nth 2 (pop groups))))))))) 1455 (gnus-info-group (nth 2 (pop groups)))))))))
1456 1456
1457(defun gnus-topic-unmark-topic (topic &optional dummy non-recursive) 1457(defun gnus-topic-unmark-topic (topic &optional _dummy non-recursive)
1458 "Remove the process mark from all groups in the TOPIC. 1458 "Remove the process mark from all groups in the TOPIC.
1459If NON-RECURSIVE (which is the prefix) is t, don't unmark its subtopics." 1459If NON-RECURSIVE (which is the prefix) is t, don't unmark its subtopics."
1460 (interactive (list (gnus-group-topic-name) 1460 (interactive (list (gnus-group-topic-name)
@@ -1488,15 +1488,14 @@ If NON-RECURSIVE (which is the prefix) is t, don't unmark its subtopics."
1488 (gnus-group-mark-regexp regexp) 1488 (gnus-group-mark-regexp regexp)
1489 (gnus-topic-move-group nil topic copyp)) 1489 (gnus-topic-move-group nil topic copyp))
1490 1490
1491(defun gnus-topic-copy-matching (regexp topic &optional copyp) 1491(defun gnus-topic-copy-matching (regexp topic &optional _copyp)
1492 "Copy all groups that match REGEXP to some topic." 1492 "Copy all groups that match REGEXP to some topic."
1493 (interactive 1493 (interactive
1494 (let (topic) 1494 (let ((topic (gnus-completing-read "Copy to topic"
1495 (mapcar #'car gnus-topic-alist) t)))
1495 (nreverse 1496 (nreverse
1496 (list 1497 (list topic
1497 (setq topic (gnus-completing-read "Copy to topic" 1498 (read-string (format "Copy to %s (regexp): " topic))))))
1498 (mapcar 'car gnus-topic-alist) t))
1499 (read-string (format "Copy to %s (regexp): " topic))))))
1500 (gnus-topic-move-matching regexp topic t)) 1499 (gnus-topic-move-matching regexp topic t))
1501 1500
1502(defun gnus-topic-delete (topic) 1501(defun gnus-topic-delete (topic)