[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 9034dd6: Fix cursor column positioning on Grep hi
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 9034dd6: Fix cursor column positioning on Grep hits |
Date: |
Sat, 19 Jan 2019 02:52:57 -0500 (EST) |
branch: emacs-26
commit 9034dd6c703975e9da3a269b84d8b756b997a4d8
Author: Trevor Spiteri <address@hidden>
Commit: Eli Zaretskii <address@hidden>
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
---
lisp/progmodes/grep.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index df8cb3d..8b9a2d8 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.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 9034dd6: Fix cursor column positioning on Grep hits,
Eli Zaretskii <=