Copy 2012-01-25 compilation-next-error-function change to another function.

* lisp/progmodes/compile.el (compilation-internal-error-properties):
Respect compilation-first-column in the "*compilation*" buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77dc97db5c7a7c5963a465570488900a7f6db5de..1187505be6705d86f992293efafdc77e0ed77238 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-01  Glenn Morris  <rgm@gnu.org>
 
+       * progmodes/compile.el (compilation-internal-error-properties):
+       Respect compilation-first-column in the "*compilation*" buffer.
+
        * emacs-lisp/easy-mmode.el (define-minor-mode):
        Relax :variable's test for a named function.
 

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3b8c3a006996b9a19b29e3294ac71f946608877c..d477569fb2d677e6df2c22e2c57c073bc56f28f1 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1058,6 +1058,7 @@ FMTS is a list of format specs for transforming the file name.
         (marker
           (if marker-line (compilation--loc->marker (cadr marker-line))))
         (screen-columns compilation-error-screen-columns)
+        (first-column compilation-first-column)
         end-marker loc end-loc)
     (if (not (and marker (marker-buffer marker)))
        (setq marker nil)               ; no valid marker for this file
@@ -1078,7 +1079,10 @@ FMTS is a list of format specs for transforming the file name.
                ;; 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-excursion
          (save-restriction
            (widen)