upstream

3 files changed, 5 insertions, 3 deletions

diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 1178a8a0b7e..fd817e3b4f4 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -290,7 +290,7 @@
           res))))
 
   (defun c-make-font-lock-search-form (regexp highlights)
-    ;; Return a lisp form which will fontify every occurence of REGEXP
+    ;; Return a lisp form which will fontify every occurrence of REGEXP
     ;; (a regular expression, NOT a function) between POINT and `limit'
     ;; with HIGHLIGHTS, a list of highlighters as specified on page
     ;; "Search-based Fontification" in the elisp manual.
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index a3300077909..d321e9c1388 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -2070,7 +2070,9 @@ for \\[find-tag] (which see)."
   (let ((comp-data (tags-completion-at-point-function)))
     (if (null comp-data)
         (error "Nothing to complete")
-      (apply 'completion-in-region comp-data))))
+      (completion-in-region (car comp-data) (cadr comp-data)
+                            (nth 2 comp-data)
+                            (plist-get (nthcdr 3 comp-data) :predicate)))))
 
 (dolist (x '("^No tags table in use; use .* to select one$"
              "^There is no default tag$"
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 000243b05df..2c68a29dd00 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -476,7 +476,7 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
              ;; so the buffer is still unmodified if there is no output.
              (cond ((and (zerop code) (buffer-modified-p))
                     '("finished (matches found)\n" . "matched"))
-                   ((or (= code 1) (not (buffer-modified-p)))
+                   ((not (buffer-modified-p))
                     '("finished with no matches found\n" . "no match"))
                    (t
                     (cons msg code)))