mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

(grep-regexp-alist): Replace complex regexp

Browse Source 
matching line numbers, column numbers and their ranges with regexp
matching only line numbers.
(grep-context-face): New face variable.
(grep-mode-font-lock-keywords): Use it.
This commit is contained in:
Juri Linkov 2005-08-04 01:11:17 +00:00
parent 81435dc42a
commit 3595212959
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/ChangeLog
View File

@ -1,3 +1,13 @@
2005-08-04 Juri Linkov <juri@jurta.org>
* progmodes/grep.el (grep-regexp-alist): Replace complex regexp
matching line numbers, column numbers and their ranges with regexp
matching only line numbers.
(grep-context-face): New face variable.
(grep-mode-font-lock-keywords): Use it.
* faces.el (read-face-name): Delete duplicate faces.
2005-08-02 Juanma Barranquero <lekktu@gmail.com>
* thumbs.el (thumbs-find-image): Don't make variables
@ -234,8 +244,6 @@
2005-07-22 Juri Linkov <juri@jurta.org>
* simple.el (line-move-1): Fix comments.
* startup.el (normal-splash-screen): Update menu name.
* tempo.el (tempo-insert-template): Fix 2005-07-16 change.

17
lisp/progmodes/grep.el
View File

@ -248,13 +248,12 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
;;;###autoload
(defvar grep-regexp-alist
;; rms: I removed the code to match parens around the line number
;; because it causes confusion and so we will find out if anyone needs it.
;; It causes confusion with a file name that contains a number in parens.
'(("^\\(.+?\\)\\([: \t]\\)+\
\\([0-9]+\\)\\([.:]?\\)\\([0-9]+\\)?\
\\(?:-\\(?:\\([0-9]+\\)\\4\\)?\\.?\\([0-9]+\\)?\\)?\\2"
1 (3 . 6) (5 . 7))
'(("^\\([^:\n]+\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2"
1 3)
;; Rule to match column numbers is commented out since no known grep
;; produces them
;; ("^\\([^:\n]+\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\2\\)?"
;; 1 3 (4 . 5))
("^\\(\\(.+?\\):\\([0-9]+\\):\\).*?\
\\(\033\\[01;31m\\(?:\033\\[K\\)?\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
2 3
@ -284,6 +283,9 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
(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.")
(defvar grep-mode-font-lock-keywords
'(;; Command output lines.
("^\\([A-Za-z_0-9/\.+-]+\\)[ \t]*:" 1 font-lock-function-name-face)
@ -298,6 +300,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
(0 '(face nil message nil help-echo nil mouse-face nil) t)
(1 grep-error-face)
(2 grep-error-face))
("^[^\n-]+-[0-9]+-.*" (0 grep-context-face))
;; Highlight grep matches and delete markers
("\\(\033\\[01;31m\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
;; Refontification does not work after the markers have been