aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 @@
12012-02-01 Glenn Morris <rgm@gnu.org> 12012-02-01 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/compile.el (compilation-internal-error-properties):
4 Respect compilation-first-column in the "*compilation*" buffer.
5
3 * emacs-lisp/easy-mmode.el (define-minor-mode): 6 * emacs-lisp/easy-mmode.el (define-minor-mode):
4 Relax :variable's test for a named function. 7 Relax :variable's test for a named function.
5 8
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.
1058 (marker 1058 (marker
1059 (if marker-line (compilation--loc->marker (cadr marker-line)))) 1059 (if marker-line (compilation--loc->marker (cadr marker-line))))
1060 (screen-columns compilation-error-screen-columns) 1060 (screen-columns compilation-error-screen-columns)
1061 (first-column compilation-first-column)
1061 end-marker loc end-loc) 1062 end-marker loc end-loc)
1062 (if (not (and marker (marker-buffer marker))) 1063 (if (not (and marker (marker-buffer marker)))
1063 (setq marker nil) ; no valid marker for this file 1064 (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.
1078 ;; Obey the compilation-error-screen-columns of the target 1079 ;; Obey the compilation-error-screen-columns of the target
1079 ;; buffer if its major mode set it buffer-locally. 1080 ;; buffer if its major mode set it buffer-locally.
1080 (if (local-variable-p 'compilation-error-screen-columns) 1081 (if (local-variable-p 'compilation-error-screen-columns)
1081 compilation-error-screen-columns screen-columns))) 1082 compilation-error-screen-columns screen-columns))
1083 (compilation-first-column
1084 (if (local-variable-p 'compilation-first-column)
1085 compilation-first-column first-column)))
1082 (save-excursion 1086 (save-excursion
1083 (save-restriction 1087 (save-restriction
1084 (widen) 1088 (widen)