Merge null and without-null regexp alists (Bug#27840, Bug#27873)
commitc2f1830d69f5a5e20dac6fcbf3af4d51afba92bd
authorNoam Postavsky <npostavs@gmail.com>
Sun, 30 Jul 2017 18:47:05 +0000 (30 14:47 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Mon, 7 Aug 2017 00:25:11 +0000 (6 20:25 -0400)
treea585023b7bbf06d57ac72188cfd34460a788ad18
parent93511e94735de5862880f5ea9bf12705c1440363
Merge null and without-null regexp alists (Bug#27840, Bug#27873)

* 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.
lisp/cedet/semantic/symref/grep.el
lisp/progmodes/grep.el
lisp/progmodes/xref.el