mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge null and without-null regexp alists (Bug#27840, Bug#27873)

Browse source 
* lisp/progmodes/grep.el (grep-mode-font-lock-keywords): Allow for NUL
characters following filename in grep context lines.
(grep--regexp-alist-column, grep--regexp-alist-bin-matcher)
(grep-with-null-regexp-alist, grep-fallback-regexp-alist): Remove.
(grep-regexp-alist): Recombine their contents here.
(grep-mode):
* lisp/cedet/semantic/symref/grep.el
(semantic-symref-parse-tool-output-one-line):
* lisp/progmodes/xref.el (xref-collect-matches): Use the variable
`grep-regexp-alist' rather than the function.
This commit is contained in:
Noam Postavsky 2017-07-30 14:47:05 -04:00
parent 93511e9473
commit c2f1830d69
3 changed files with 43 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/cedet/semantic/symref/grep.el
View file

@ -193,7 +193,7 @@ This shell should support pipe redirect syntax."
"Parse one line of grep output, and return it as a match list.
Moves cursor to end of the match."
(pcase-let
((`(,grep-re ,file-group ,line-group . ,_) (car (grep-regexp-alist))))
((`(,grep-re ,file-group ,line-group . ,_) (car grep-regexp-alist)))
(cond ((eq (oref tool :resulttype) 'file)
;; Search for files
(when (re-search-forward "^\\([^\n]+\\)$" nil t)