[Emacs-diffs] /srv/bzr/emacs/trunk r106926: compile/grep fix for bug#10594

[Glenn Morris]

------------------------------------------------------------
revno: 106926
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-01-24 21:01:22 -0500
message:
  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.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-25 00:07:04 +0000
+++ b/lisp/ChangeLog    2012-01-25 02:01:22 +0000
@@ -1,5 +1,9 @@
 2012-01-25  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/compile.el 2012-01-25 02:01:22 +0000
@@ -2271,6 +2271,7 @@
   (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 @@
                ;; 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))

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/grep.el    2012-01-25 02:01:22 +0000
@@ -374,6 +374,9 @@
     ("^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.")