5 files changed, 44 insertions, 26 deletions

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 60823445b97..6ef8ffb0933 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -619,7 +619,7 @@ Switch to the most recently selected buffer other than the current one."
               :button (:toggle . (bound-and-true-p flyspell-mode))))
 (bindings--define-key mode-line-mode-menu [auto-revert-tail-mode]
   '(menu-item "Auto revert tail (Tail)" auto-revert-tail-mode
-              :help "Revert the tail of the buffer when buffer grows"
+              :help "Revert the tail of the buffer when the file on disk grows"
               :enable (buffer-file-name)
               :button (:toggle . (bound-and-true-p auto-revert-tail-mode))))
 (bindings--define-key mode-line-mode-menu [auto-revert-mode]
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 32be336d13a..e15eba75924 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -624,7 +624,7 @@ MIME-TYPE specifies a MIME type and parameters, which defaults to the
 value of `mm-uu-text-plain-type'."
   (let ((case-fold-search t)
         (mm-uu-text-plain-type (or mime-type mm-uu-text-plain-type))
-        text-start start-point end-point file-name result entry func)
+        text-start start-point end-point file-name result mm-uu-entry func)
     (save-excursion
       (goto-char (point-min))
       (cond
@@ -637,26 +637,26 @@ value of `mm-uu-text-plain-type'."
       (setq text-start (point))
       (while (re-search-forward mm-uu-beginning-regexp nil t)
         (setq start-point (match-beginning 0)
-              entry nil)
+              mm-uu-entry nil)
         (let ((alist mm-uu-type-alist)
               (beginning-regexp (match-string 0)))
-          (while (not entry)
+          (while (not mm-uu-entry)
             (if (string-match (mm-uu-beginning-regexp (car alist))
                               beginning-regexp)
-                (setq entry (car alist))
+                (setq mm-uu-entry (car alist))
               (pop alist))))
-        (if (setq func (mm-uu-function-1 entry))
+        (if (setq func (mm-uu-function-1 mm-uu-entry))
             (funcall func))
         (forward-line);; in case of failure
-        (when (and (not (mm-uu-configure-p (mm-uu-type entry) 'disabled))
-                   (let ((end-regexp (mm-uu-end-regexp entry)))
+        (when (and (not (mm-uu-configure-p (mm-uu-type mm-uu-entry) 'disabled))
+                   (let ((end-regexp (mm-uu-end-regexp mm-uu-entry)))
                      (if (not end-regexp)
                          (or (setq end-point (point-max)) t)
                        (prog1
                            (re-search-forward end-regexp nil t)
                          (forward-line)
                          (setq end-point (point)))))
-                   (or (not (setq func (mm-uu-function-2 entry)))
+                   (or (not (setq func (mm-uu-function-2 mm-uu-entry)))
                        (funcall func)))
           (if (and (> start-point text-start)
                    (progn
@@ -675,7 +675,7 @@ value of `mm-uu-text-plain-type'."
                 mm-uu-text-plain-type)
                result))
           (push
-           (funcall (mm-uu-function-extract entry))
+           (funcall (mm-uu-function-extract mm-uu-entry))
            result)
           (goto-char (setq text-start end-point))))
       (when result
diff --git a/lisp/image.el b/lisp/image.el
index 2a8ea1fb886..b5f22351377 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -977,7 +977,7 @@ default is 20%."
 
 (defun image--get-imagemagick-and-warn ()
   (unless (or (fboundp 'imagemagick-types) (featurep 'ns))
-    (error "Can't rescale images without ImageMagick support"))
+    (error "Cannot rescale images without ImageMagick support"))
   (let ((image (image--get-image)))
     (image-flush image)
     (when (fboundp 'imagemagick-types)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 9ce4ff84627..14e251e0667 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -425,6 +425,14 @@ See `compilation-error-regexp-alist' for format details.")
 (defvar grep-context-face 'shadow
   "Face name to use for grep context lines.")
 
+(defvar grep-num-matches-found 0)
+
+(defconst grep-mode-line-matches
+  `(" [" (:propertize (:eval (int-to-string grep-num-matches-found))
+                      face ,grep-hit-face
+                      help-echo "Number of matches so far")
+    "]"))
+
 (defvar grep-mode-font-lock-keywords
    '(;; Command output lines.
      (": \\(.+\\): \\(?:Permission denied\\|No such \\(?:file or directory\\|device or address\\)\\)$"
@@ -432,7 +440,7 @@ See `compilation-error-regexp-alist' for format details.")
      ;; remove match from grep-regexp-alist before fontifying
      ("^Grep[/a-zA-z]* started.*"
       (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t))
-     ("^Grep[/a-zA-z]* finished \\(?:(\\(matches found\\))\\|with \\(no matches found\\)\\).*"
+     ("^Grep[/a-zA-z]* finished with \\(?:\\(\\(?:[0-9]+ \\)?matches found\\)\\|\\(no matches found\\)\\).*"
       (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
       (1 compilation-info-face nil t)
       (2 compilation-warning-face nil t))
@@ -503,21 +511,28 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
     (setenv "GREP_COLOR" "01;31")
     ;; GREP_COLORS is used in GNU grep 2.5.2 and later versions
     (setenv "GREP_COLORS" "mt=01;31:fn=:ln=:bn=:se=:sl=:cx=:ne"))
+  (setq-local grep-num-matches-found 0)
   (set (make-local-variable 'compilation-exit-message-function)
-       (lambda (status code msg)
-         (if (eq status 'exit)
-             ;; This relies on the fact that `compilation-start'
-             ;; sets buffer-modified to nil before running the command,
-             ;; so the buffer is still unmodified if there is no output.
-             (cond ((and (zerop code) (buffer-modified-p))
-                    '("finished (matches found)\n" . "matched"))
-                   ((not (buffer-modified-p))
-                    '("finished with no matches found\n" . "no match"))
-                   (t
-                    (cons msg code)))
-           (cons msg code))))
+       'grep-exit-message)
   (run-hooks 'grep-setup-hook))
 
+(defun grep-exit-message (status code msg)
+  "Return a status message for grep results."
+  (if (eq status 'exit)
+      ;; This relies on the fact that `compilation-start'
+      ;; sets buffer-modified to nil before running the command,
+      ;; so the buffer is still unmodified if there is no output.
+      (cond ((and (zerop code) (buffer-modified-p))
+             (if (> grep-num-matches-found 0)
+                 (cons (format "finished with %d matches found\n" grep-num-matches-found)
+                       "matched")
+               '("finished with matches found\n" . "matched")))
+            ((not (buffer-modified-p))
+             '("finished with no matches found\n" . "no match"))
+            (t
+             (cons msg code)))
+    (cons msg code)))
+
 (defun grep-filter ()
   "Handle match highlighting escape sequences inserted by the grep process.
 This function is called from `compilation-filter-hook'."
@@ -535,7 +550,8 @@ This function is called from `compilation-filter-hook'."
         (while (re-search-forward "\033\\[0?1;31m\\(.*?\\)\033\\[[0-9]*m" end 1)
           (replace-match (propertize (match-string 1)
                                      'face nil 'font-lock-face grep-match-face)
-                         t t))
+                         t t)
+          (cl-incf grep-num-matches-found))
         ;; Delete all remaining escape sequences
         (goto-char beg)
         (while (re-search-forward "\033\\[[0-9;]*[mK]" end 1)
@@ -775,6 +791,8 @@ This function is called from `compilation-filter-hook'."
        grep-hit-face)
   (set (make-local-variable 'compilation-error-regexp-alist)
        grep-regexp-alist)
+  (set (make-local-variable 'compilation-mode-line-errors)
+       grep-mode-line-matches)
   ;; compilation-directory-matcher can't be nil, so we set it to a regexp that
   ;; can never match.
   (set (make-local-variable 'compilation-directory-matcher) '("\\`a\\`"))
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 21f56c9f55a..b87701536f8 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -996,7 +996,7 @@ Within directories, only files already under version control are noticed."
         ((derived-mode-p 'diff-mode)     diff-vc-backend)
         ;; Maybe we could even use comint-mode rather than shell-mode?
         ((derived-mode-p 'dired-mode 'shell-mode 'compilation-mode)
-         (vc-responsible-backend default-directory))
+         (ignore-errors (vc-responsible-backend default-directory)))
         (vc-mode (vc-backend buffer-file-name))))
 
 (declare-function vc-dir-current-file "vc-dir" ())