From: Trevor Spiteri <tspiteri@ieee.org>
Date: Mon, 14 Jan 2019 22:10:34 +0000 (+0100)
Subject: Fix cursor column positioning on Grep hits
X-Git-Tag: emacs-26.1.92~52
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9034dd6c703975e9da3a269b84d8b756b997a4d8;p=emacs.git

Fix cursor column positioning on Grep hits

* lisp/progmodes/grep.el (grep-match-face): Move before first
use, to avoid byte-compilation warning.
(grep-regexp-alist): Don't quote grep-match-face.  (Bug#34068)

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index df8cb3da7ef..8b9a2d86c75 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -366,6 +366,9 @@ A grep buffer becomes most recent when you select Grep mode in it.
 Notice that using \\[next-error] or \\[compile-goto-error] modifies
 `compilation-last-buffer' rather than `grep-last-buffer'.")
 
+(defvar grep-match-face	'match
+  "Face name to use for grep matches.")
+
 ;;;###autoload
 (defconst grep-regexp-alist
   `((,(concat "^\\(?:"
@@ -389,7 +392,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
          (when grep-highlight-matches
            (let* ((beg (match-end 0))
                   (end (save-excursion (goto-char beg) (line-end-position)))
-                  (mbeg (text-property-any beg end 'font-lock-face 'grep-match-face)))
+                  (mbeg (text-property-any beg end 'font-lock-face grep-match-face)))
              (when mbeg
                (- mbeg beg)))))
       .
@@ -397,7 +400,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
          (when grep-highlight-matches
            (let* ((beg (match-end 0))
                   (end (save-excursion (goto-char beg) (line-end-position)))
-                  (mbeg (text-property-any beg end 'font-lock-face 'grep-match-face))
+                  (mbeg (text-property-any beg end 'font-lock-face grep-match-face))
                   (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end))))
              (when mend
                (- mend beg))))))
@@ -421,9 +424,6 @@ See `compilation-error-regexp-alist' for format details.")
 (defvar grep-error-face	'compilation-error
   "Face name to use for grep error messages.")
 
-(defvar grep-match-face	'match
-  "Face name to use for grep matches.")
-
 (defvar grep-context-face 'shadow
   "Face name to use for grep context lines.")