From 6944dbc18a1591bc7435193685db90a6b9343914 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 18 Nov 2011 10:09:42 -0500 Subject: [PATCH] * lisp/progmodes/compile.el: Obey compilation-first-column in dest buffer. (compilation-error-properties, compilation-move-to-column): Handle compilation-first-column while in the target buffer. --- lisp/ChangeLog | 4 ++++ lisp/progmodes/compile.el | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 15646c6cde3..bedc440359c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2011-11-18 Stefan Monnier + * progmodes/compile.el: Obey compilation-first-column in dest buffer. + (compilation-error-properties, compilation-move-to-column): + Handle compilation-first-column while in the target buffer. + * progmodes/cc-engine.el (c-remove-stale-state-cache-backwards): Don't hardcode point-min==1. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 3dba1af515a..73e990e2755 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1013,11 +1013,11 @@ POS and RES.") (setq col (funcall col)) (and (setq col (match-string-no-properties col)) - (setq col (- (string-to-number col) compilation-first-column))))) + (setq col (string-to-number col))))) (if (and end-col (functionp end-col)) (setq end-col (funcall end-col)) (if (and end-col (setq end-col (match-string-no-properties end-col))) - (setq end-col (- (string-to-number end-col) compilation-first-column -1)) + (setq end-col (- (string-to-number end-col) -1)) (if end-line (setq end-col -1)))) (if (consp type) ; not a static type, check what it is. (setq type (or (and (car type) (match-end (car type)) 1) @@ -1037,6 +1037,7 @@ POS and RES.") "Go to column COL on the current line. If SCREEN is non-nil, columns are screen columns, otherwise, they are just char-counts." + (setq col (- col compilation-first-column)) (if screen (move-to-column (max col 0)) (goto-char (min (+ (line-beginning-position) col) (line-end-position))))) -- 2.11.4.GIT