Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / gnus-topic.el

diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index c5a1777f4037d038e60c278f218eb826261ac103..39236594eb73c3da0d96bd6c304d01410ac8deae 100644 (file)
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -572,7 +572,6 @@ articles in the topic and its subtopics."
                   (not (zerop unread)) ;Non-empty
                   tick                 ;Ticked articles
                   (/= point-max (point-max)))) ;Inactive groups
-      (gnus-extent-start-open (point))
       (gnus-topic-insert-topic-line
        (car type) visiblep
        (not (eq (nth 2 type) 'hidden))
@@ -641,7 +640,7 @@ articles in the topic and its subtopics."
     (beginning-of-line)
     ;; Insert the text.
     (if shownp
-       (gnus-add-text-properties
+       (add-text-properties
         (point)
         (prog1 (1+ (point))
           (eval gnus-topic-line-format-spec))
@@ -1150,7 +1149,6 @@ articles in the topic and its subtopics."
           'gnus-group-sort-topic)
       (setq gnus-group-change-level-function 'gnus-topic-change-level)
       (setq gnus-goto-missing-group-function 'gnus-topic-goto-missing-group)
-      (gnus-make-local-hook 'gnus-check-bogus-groups-hook)
       (add-hook 'gnus-check-bogus-groups-hook 'gnus-topic-clean-alist
                nil 'local)
       (setq gnus-topology-checked-p nil)
@@ -1612,8 +1610,8 @@ If performed on a topic, edit the topic parameters instead."
       (let ((topic (gnus-group-topic-name)))
        (gnus-edit-form
         (gnus-topic-parameters topic)
-        (gnus-format-message "Editing the topic parameters for `%s'."
-                             (or group topic))
+        (format-message "Editing the topic parameters for `%s'."
+                        (or group topic))
         `(lambda (form)
            (gnus-topic-set-parameters ,topic form)))))))