aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuri Linkov2013-05-24 23:54:38 +0300
committerJuri Linkov2013-05-24 23:54:38 +0300
commit7a1d7ba7d22e9d82fdde0bc6e9fcc5152a7c9670 (patch)
tree31e234c917519abc1e541d049e9360f8daaed248 /lisp
parent650cff3d874e68a8aa80cbdb71ff9f48e10d1cb6 (diff)
downloademacs-7a1d7ba7d22e9d82fdde0bc6e9fcc5152a7c9670.tar.gz
emacs-7a1d7ba7d22e9d82fdde0bc6e9fcc5152a7c9670.zip
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords): Support =linenumber=
format used by git-grep for lines with function names. Fixes: debbugs:13549
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/grep.el4
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2495620ef1c..e12652e7cbd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-05-24 Juri Linkov <juri@jurta.org>
2
3 * progmodes/grep.el (grep-mode-font-lock-keywords):
4 Support =linenumber= format used by git-grep for lines with
5 function names. (Bug#13549)
6
12013-05-24 Stefan Monnier <monnier@iro.umontreal.ca> 72013-05-24 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * progmodes/octave.el (octave-smie-rules): Return nil rather than 9 * progmodes/octave.el (octave-smie-rules): Return nil rather than
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 1e152c6d751..46af51e1f97 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -410,7 +410,9 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
410 (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t) 410 (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
411 (1 grep-error-face) 411 (1 grep-error-face)
412 (2 grep-error-face nil t)) 412 (2 grep-error-face nil t))
413 ("^.+?-[0-9]+-.*\n" (0 grep-context-face))) 413 ;; "filename-linenumber-" format is used for context lines in GNU grep,
414 ;; "filename=linenumber=" for lines with function names in "git grep -p".
415 ("^.+?[-=][0-9]+[-=].*\n" (0 grep-context-face)))
414 "Additional things to highlight in grep output. 416 "Additional things to highlight in grep output.
415This gets tacked on the end of the generated expressions.") 417This gets tacked on the end of the generated expressions.")
416 418