From: Glenn Morris <rgm@gnu.org>
Date: Wed, 25 Jan 2012 02:01:22 +0000 (-0500)
Subject: compile/grep fix for bug#10594
X-Git-Tag: emacs-pretest-24.0.93~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ddce96c6179e43047ed365dc4ae2818cdc93d7b;p=emacs.git

compile/grep fix for bug#10594

* 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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a07d90969fa..eff83cb8460 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index f152209956f..3b8c3a00699 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -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))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 697af76acc9..54d678323f6 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -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.")