[Emacs-diffs] /srv/bzr/emacs/trunk r106416: * lisp/progmodes/compile.el: Obey compilation-first-column in dest buffer.

[Stefan Monnier]

------------------------------------------------------------
revno: 106416
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-11-18 10:09:42 -0500
message:
  * 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.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-11-18 15:06:20 +0000
+++ b/lisp/ChangeLog    2011-11-18 15:09:42 +0000
@@ -1,5 +1,9 @@
 2011-11-18  Stefan Monnier  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-11-09 15:39:32 +0000
+++ b/lisp/progmodes/compile.el 2011-11-18 15:09:42 +0000
@@ -1013,11 +1013,11 @@
             (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 @@
   "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)))))