[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112719: * lisp/progmodes/grep.el (gr
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112719: * lisp/progmodes/grep.el (grep-mode-font-lock-keywords): Support =linenumber= |
Date: |
Fri, 24 May 2013 23:54:38 +0300 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112719
fixes bug: http://debbugs.gnu.org/13549
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-05-24 23:54:38 +0300
message:
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords): Support =linenumber=
format used by git-grep for lines with function names.
modified:
etc/grep.txt
lisp/ChangeLog
lisp/progmodes/grep.el
=== modified file 'etc/grep.txt'
--- a/etc/grep.txt 2013-01-01 09:11:05 +0000
+++ b/etc/grep.txt 2013-05-24 20:54:38 +0000
@@ -72,6 +72,14 @@
agrep -n "INFO tree" ../info/*
../info/dir: 6: File: dir Node: Top This is the top of the INFO tree
+* git-grep
+ with `[diff "el"] xfuncname = "^(\\(.*)$"' in .gitconfig
+ and `*.el diff=el' in .gitattributes
+
+git grep -inH -p -e "org-element-map"
+lisp/org/org.el=20969=(defun org-fill-paragraph (&optional justify)
+lisp/org/org.el:21047: (org-element-map
+
* unknown greps
grep -nH -e "xyzxyz" ../info/*
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-24 19:37:55 +0000
+++ b/lisp/ChangeLog 2013-05-24 20:54:38 +0000
@@ -1,3 +1,9 @@
+2013-05-24 Juri Linkov <address@hidden>
+
+ * progmodes/grep.el (grep-mode-font-lock-keywords):
+ Support =linenumber= format used by git-grep for lines with
+ function names. (Bug#13549)
+
2013-05-24 Stefan Monnier <address@hidden>
* progmodes/octave.el (octave-smie-rules): Return nil rather than
=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el 2013-02-12 04:46:18 +0000
+++ b/lisp/progmodes/grep.el 2013-05-24 20:54:38 +0000
@@ -410,7 +410,9 @@
(0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
(1 grep-error-face)
(2 grep-error-face nil t))
- ("^.+?-[0-9]+-.*\n" (0 grep-context-face)))
+ ;; "filename-linenumber-" format is used for context lines in GNU grep,
+ ;; "filename=linenumber=" for lines with function names in "git grep -p".
+ ("^.+?[-=][0-9]+[-=].*\n" (0 grep-context-face)))
"Additional things to highlight in grep output.
This gets tacked on the end of the generated expressions.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112719: * lisp/progmodes/grep.el (grep-mode-font-lock-keywords): Support =linenumber=,
Juri Linkov <=