Sync up with gnus-6_2_3 to gnus-6_4_0
[elisp/gnus.git-] / lisp / gnus-topic.el
index f5a574c..249367d 100644 (file)
@@ -1,8 +1,8 @@
 ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
 
 ;; Author: Ilja Weis <kult@uni-paderborn.de>
-;;     Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;;     Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -355,8 +355,8 @@ with some simple extensions.
 ;;; Generating group buffers
 
 (defun gnus-group-prepare-topics (level &optional all lowest regexp list-topic topic-level)
-  "List all newsgroups with unread articles of level LEVEL or lower, and
-use the `gnus-group-topics' to sort the groups.
+  "List all newsgroups with unread articles of level LEVEL or lower.
+Use the `gnus-group-topics' to sort the groups.
 If ALL is non-nil, list groups that have no unread articles.
 If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
   (set-buffer gnus-group-buffer)
@@ -398,7 +398,7 @@ If LOWEST is non-nil, list all newsgroups of level LOWEST or higher."
 
       (gnus-group-set-mode-line)
       (setq gnus-group-list-mode (cons level all))
-      (run-hooks 'gnus-group-prepare-hook))))
+      (gnus-run-hooks 'gnus-group-prepare-hook))))
 
 (defun gnus-topic-prepare-topic (topicl level &optional list-level all silent
                                        lowest)
@@ -734,59 +734,60 @@ articles in the topic and its subtopics."
   "Run when changing levels to enter/remove groups from topics."
   (save-excursion
     (set-buffer gnus-group-buffer)
-    (unless gnus-topic-inhibit-change-level
-      (gnus-group-goto-group (or (car (nth 2 previous)) group))
-      (when (and gnus-topic-mode
-                gnus-topic-alist
-                (not gnus-topic-inhibit-change-level))
-       ;; Remove the group from the topics.
-       (if (and (< oldlevel gnus-level-zombie)
-                (>= level gnus-level-zombie))
-           (let ((alist gnus-topic-alist))
-             (while (gnus-group-goto-group group)
-               (gnus-delete-line))
-             (while alist
-               (when (member group (car alist))
-                 (setcdr (car alist) (delete group (cdar alist))))
-               (pop alist)))
-         ;; If the group is subscribed we enter it into the topics.
-         (when (and (< level gnus-level-zombie)
-                    (>= oldlevel gnus-level-zombie))
-           (let* ((prev (gnus-group-group-name))
-                  (gnus-topic-inhibit-change-level t)
-                  (gnus-group-indentation
-                   (make-string
-                    (* gnus-topic-indent-level
-                       (or (save-excursion
-                             (gnus-topic-goto-topic (gnus-current-topic))
-                             (gnus-group-topic-level))
-                           0))
-                    ? ))
-                  (yanked (list group))
-                  alist talist end)
-             ;; Then we enter the yanked groups into the topics they belong
-             ;; to.
-             (when (setq alist (assoc (save-excursion
-                                        (forward-line -1)
-                                        (or
-                                         (gnus-current-topic)
-                                         (caar gnus-topic-topology)))
-                                      gnus-topic-alist))
-               (setq talist alist)
-               (when (stringp yanked)
-                 (setq yanked (list yanked)))
-               (if (not prev)
-                   (nconc alist yanked)
-                 (if (not (cdr alist))
-                     (setcdr alist (nconc yanked (cdr alist)))
-                   (while (and (not end) (cdr alist))
-                     (when (equal (cadr alist) prev)
+    (let ((buffer-read-only nil))
+      (unless gnus-topic-inhibit-change-level
+       (gnus-group-goto-group (or (car (nth 2 previous)) group))
+       (when (and gnus-topic-mode
+                  gnus-topic-alist
+                  (not gnus-topic-inhibit-change-level))
+         ;; Remove the group from the topics.
+         (if (and (< oldlevel gnus-level-zombie)
+                  (>= level gnus-level-zombie))
+             (let ((alist gnus-topic-alist))
+               (while (gnus-group-goto-group group)
+                 (gnus-delete-line))
+               (while alist
+                 (when (member group (car alist))
+                   (setcdr (car alist) (delete group (cdar alist))))
+                 (pop alist)))
+           ;; If the group is subscribed we enter it into the topics.
+           (when (and (< level gnus-level-zombie)
+                      (>= oldlevel gnus-level-zombie))
+             (let* ((prev (gnus-group-group-name))
+                    (gnus-topic-inhibit-change-level t)
+                    (gnus-group-indentation
+                     (make-string
+                      (* gnus-topic-indent-level
+                         (or (save-excursion
+                               (gnus-topic-goto-topic (gnus-current-topic))
+                               (gnus-group-topic-level))
+                             0))
+                      ? ))
+                    (yanked (list group))
+                    alist talist end)
+               ;; Then we enter the yanked groups into the topics they belong
+               ;; to.
+               (when (setq alist (assoc (save-excursion
+                                          (forward-line -1)
+                                          (or
+                                           (gnus-current-topic)
+                                           (caar gnus-topic-topology)))
+                                        gnus-topic-alist))
+                 (setq talist alist)
+                 (when (stringp yanked)
+                   (setq yanked (list yanked)))
+                 (if (not prev)
+                     (nconc alist yanked)
+                   (if (not (cdr alist))
                        (setcdr alist (nconc yanked (cdr alist)))
-                       (setq end t))
-                     (setq alist (cdr alist)))
-                   (unless end
-                     (nconc talist yanked))))))
-           (gnus-topic-update-topic)))))))
+                     (while (and (not end) (cdr alist))
+                       (when (equal (cadr alist) prev)
+                         (setcdr alist (nconc yanked (cdr alist)))
+                         (setq end t))
+                       (setq alist (cdr alist)))
+                     (unless end
+                       (nconc talist yanked))))))
+             (gnus-topic-update-topic))))))))
 
 (defun gnus-topic-goto-next-group (group props)
   "Go to group or the next group after group."
@@ -980,7 +981,7 @@ articles in the topic and its subtopics."
       ;; We check the topology.
       (when gnus-newsrc-alist
        (gnus-topic-check-topology))
-      (run-hooks 'gnus-topic-mode-hook))
+      (gnus-run-hooks 'gnus-topic-mode-hook))
     ;; Remove topic infestation.
     (unless gnus-topic-mode
       (remove-hook 'gnus-summary-exit-hook 'gnus-topic-update-topic)
@@ -1250,6 +1251,10 @@ If COPYP, copy the groups instead."
    (let ((topic (gnus-current-topic)))
      (list topic
           (read-string (format "Rename %s to: " topic)))))
+  ;; Check whether the new name exists.
+  (when (gnus-topic-find-topology new-name)
+    (error "Topic '%s' already exists"))
+  ;; Do the renaming.
   (let ((top (gnus-topic-find-topology old-name))
        (entry (assoc old-name gnus-topic-alist)))
     (when top