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

compile/grep fix for bug#10594

Browse Source 
* lisp/progmodes/compile.el (compilation-next-error-function):
Respect compilation-first-column in the "*compilation*" buffer.
* lisp/progmodes/grep.el (grep-first-column): New variable.
This commit is contained in:
Glenn Morris 2012-01-24 21:01:22 -05:00
parent 5ae1a6c8a2
commit 5ddce96c61
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,5 +1,9 @@
2012-01-25 Glenn Morris <rgm@gnu.org>
* progmodes/compile.el (compilation-next-error-function):
Respect compilation-first-column in the "*compilation*" buffer.
* progmodes/grep.el (grep-first-column): New variable. (Bug#10594)
* vc/vc.el (vc-modify-change-comment): Scoping fix. (Bug#10513)
2012-01-24 Glenn Morris <rgm@gnu.org>

6
lisp/progmodes/compile.el
View File

@ -2271,6 +2271,7 @@ This is the value of `next-error-function' in Compilation buffers."
(when reset
(setq compilation-current-error nil))
(let* ((screen-columns compilation-error-screen-columns)
(first-column compilation-first-column)
(last 1)
(msg (compilation-next-error (or n 1) nil
(or compilation-current-error
@ -2309,7 +2310,10 @@ This is the value of `next-error-function' in Compilation buffers."
;; Obey the compilation-error-screen-columns of the target
;; buffer if its major mode set it buffer-locally.
(if (local-variable-p 'compilation-error-screen-columns)
compilation-error-screen-columns screen-columns)))
compilation-error-screen-columns screen-columns))
(compilation-first-column
(if (local-variable-p 'compilation-first-column)
compilation-first-column first-column)))
(save-restriction
(widen)
(goto-char (point-min))

3
lisp/progmodes/grep.el
View File

@ -374,6 +374,9 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))
"Regexp used to match grep hits. See `compilation-error-regexp-alist'.")
(defvar grep-first-column 0 ; bug#10594
"Value to use for `compilation-first-column' in grep buffers.")
(defvar grep-error "grep hit"
"Message to print when no matches are found.")