[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el |
Date: |
Mon, 15 Nov 2004 18:15:10 -0500 |
Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.337
emacs/lisp/progmodes/compile.el:1.338
*** emacs/lisp/progmodes/compile.el:1.337 Mon Nov 15 04:51:50 2004
--- emacs/lisp/progmodes/compile.el Mon Nov 15 23:09:19 2004
***************
*** 606,611 ****
--- 606,619 ----
2)))
(compilation-internal-error-properties file line end-line col end-col
type fmt)))
+ (defun compilation-move-to-column (col screen)
+ "Go to column COL on the current line.
+ If SCREEN is non-nil, columns are screen columns, otherwise, they are
+ just char-counts."
+ (if screen
+ (move-to-column col)
+ (goto-char (min (+ (line-beginning-position) col) (line-end-position)))))
+
(defun compilation-internal-error-properties (file line end-line col end-col
type fmt)
"Get the meta-info that will be added as text-properties.
LINE, END-LINE, COL, END-COL are integers or nil.
***************
*** 640,656 ****
(beginning-of-line (- (or end-line line) marker-line -1))
(if (or (null end-col) (< end-col 0))
(end-of-line)
! (if compilation-error-screen-columns
! (move-to-column end-col)
! (forward-char end-col)))
(setq end-marker (list (point-marker))))
(beginning-of-line (if end-line
(- line end-line -1)
(- loc marker-line -1)))
(if col
! (if compilation-error-screen-columns
! (move-to-column col)
! (forward-char col))
(forward-to-indentation 0))
(setq marker (list (point-marker))))))
--- 648,662 ----
(beginning-of-line (- (or end-line line) marker-line -1))
(if (or (null end-col) (< end-col 0))
(end-of-line)
! (compilation-move-to-column
! end-col compilation-error-screen-columns))
(setq end-marker (list (point-marker))))
(beginning-of-line (if end-line
(- line end-line -1)
(- loc marker-line -1)))
(if col
! (compilation-move-to-column
! col compilation-error-screen-columns)
(forward-to-indentation 0))
(setq marker (list (point-marker))))))
***************
*** 1491,1500 ****
(if (car col)
(if (eq (car col) -1) ; special case for range end
(end-of-line)
! (if columns
! (move-to-column (car col))
! (beginning-of-line)
! (forward-char (car col))))
(beginning-of-line)
(skip-chars-forward " \t"))
(if (nth 3 col)
--- 1497,1503 ----
(if (car col)
(if (eq (car col) -1) ; special case for range end
(end-of-line)
! (compilation-move-to-column (car col) columns))
(beginning-of-line)
(skip-chars-forward " \t"))
(if (nth 3 col)
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Juri Linkov, 2004/11/08
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Stefan Monnier, 2004/11/14
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Stefan Monnier, 2004/11/15
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Daniel Pfeiffer, 2004/11/22
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Richard M . Stallman, 2004/11/24
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Richard M . Stallman, 2004/11/24