Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-notifications.el b/lisp/gnus/gnus-notifications.el
index 5a116cc0f759d85c06b383c5f4f1f193b9d1f86f..2f6d6a8b61961d8af42be7729386665e3b4f910b 100644 (file)
--- a/lisp/gnus/gnus-notifications.el
+++ b/lisp/gnus/gnus-notifications.el
@@ -81,7 +81,7 @@ not get notifications."
             (article (nth 2 group-article)))
         (cond ((string= key "read")
                (gnus-fetch-group group (list article))
-               (gnus-select-frame-set-input-focus (selected-frame)))
+               (select-frame-set-input-focus (selected-frame)))
               ((string= key "mark-read")
                (gnus-update-read-articles
                 group
@@ -182,8 +182,9 @@ This is typically a function to add in
                                address
                                (cond ((functionp gnus-ignored-from-addresses)
                                       (funcall gnus-ignored-from-addresses address))
-                                     (t (gnus-string-match-p (gnus-ignored-from-addresses)
-                                                             address))))
+                                     (t (string-match-p
+                                        (gnus-ignored-from-addresses)
+                                        address))))
                     (let* ((photo-file (gnus-notifications-get-photo-file address))
                            (notification-id (gnus-notifications-notify
                                              (or (car address-components) address)