summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-01-31 23:32:21 -0800
committerGlenn Morris <rgm@gnu.org>2012-01-31 23:32:21 -0800
commit6035be5240d6a7fb5e39d0ef4d5d2b3b3d0b60b2 (patch)
treed3c6720612a4374a95578520e072061198ad46d3 /lisp
parent6df372680c56c386edba7333490588fac1a3aa63 (diff)
downloademacs-6035be5240d6a7fb5e39d0ef4d5d2b3b3d0b60b2.tar.gz
emacs-6035be5240d6a7fb5e39d0ef4d5d2b3b3d0b60b2.tar.bz2
emacs-6035be5240d6a7fb5e39d0ef4d5d2b3b3d0b60b2.zip
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.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/compile.el6
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77dc97db5c7..1187505be67 100644
--- 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 3b8c3a00699..d477569fb2d 100644
--- 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)