Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 11f93a29a1f58ba2a102d7c96dc4e37a3371ddcc..6c1915ba909f7319c6cb06ea59c2362bc2a00738 100644 (file)
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -547,12 +547,9 @@ manipulated as follows:
        ["Remove" gnus-agent-remove-server t]))))
 
 (defun gnus-agent-make-mode-line-string (string mouse-button mouse-func)
-  (if (and (fboundp 'propertize)
-          (fboundp 'make-mode-line-mouse-map))
-      (propertize string 'local-map
-                 (make-mode-line-mouse-map mouse-button mouse-func)
-                 'mouse-face 'mode-line-highlight)
-    string))
+  (propertize string 'local-map
+             (make-mode-line-mouse-map mouse-button mouse-func)
+             'mouse-face 'mode-line-highlight))
 
 (defun gnus-agent-toggle-plugged (set-to)
   "Toggle whether Gnus is unplugged or not."
@@ -2682,7 +2679,7 @@ The following commands are available:
   (let* ((gnus-tmp-name (format "%s" (car category)))
         (gnus-tmp-groups (length (gnus-agent-cat-groups category))))
     (beginning-of-line)
-    (gnus-add-text-properties
+    (add-text-properties
      (point)
      (prog1 (1+ (point))
        ;; Insert the text.