[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: |
Juri Linkov |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el |
Date: |
Thu, 02 Sep 2004 12:40:50 -0400 |
Index: emacs/lisp/progmodes/compile.el
diff -c emacs/lisp/progmodes/compile.el:1.325
emacs/lisp/progmodes/compile.el:1.326
*** emacs/lisp/progmodes/compile.el:1.325 Thu Sep 2 09:45:31 2004
--- emacs/lisp/progmodes/compile.el Thu Sep 2 16:35:17 2004
***************
*** 579,590 ****
(and end-line
(setq end-line (match-string-no-properties end-line))
(setq end-line (string-to-number end-line)))
! (and col
! (setq col (match-string-no-properties col))
! (setq col (- (string-to-number col) compilation-first-column)))
! (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))
! (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)
(and (cdr type) (match-end (cdr type)) 0)
--- 579,595 ----
(and end-line
(setq end-line (match-string-no-properties end-line))
(setq end-line (string-to-number end-line)))
! (if col
! (if (functionp col)
! (setq col (funcall col))
! (and
! (setq col (match-string-no-properties col))
! (setq col (- (string-to-number col) compilation-first-column)))))
! (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))
! (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)
(and (cdr type) (match-end (cdr type)) 0)
***************
*** 726,734 ****
,@(when end-line
`((,end-line compilation-line-face nil t)))
! ,@(when col
`((,col compilation-column-face nil t)))
! ,@(when end-col
`((,end-col compilation-column-face nil t)))
,@(nthcdr 6 item)
--- 731,739 ----
,@(when end-line
`((,end-line compilation-line-face nil t)))
! ,@(when (integerp col)
`((,col compilation-column-face nil t)))
! ,@(when (integerp end-col)
`((,end-col compilation-column-face nil t)))
,@(nthcdr 6 item)
***************
*** 1524,1530 ****
(defun compilation-goto-locus (msg mk end-mk)
"Jump to an error corresponding to MSG at MK.
! All arguments are markers. If END-MK is non-nil, mark is set there."
(if (eq (window-buffer (selected-window))
(marker-buffer msg))
;; If the compilation buffer window is selected,
--- 1529,1536 ----
(defun compilation-goto-locus (msg mk end-mk)
"Jump to an error corresponding to MSG at MK.
! All arguments are markers. If END-MK is non-nil, mark is set there
! and overlay is highlighted between MK and END-MK."
(if (eq (window-buffer (selected-window))
(marker-buffer msg))
;; If the compilation buffer window is selected,
***************
*** 1540,1546 ****
(widen)
(goto-char mk))
(if end-mk
! (push-mark end-mk nil t)
(if mark-active (setq mark-active)))
;; If hideshow got in the way of
;; seeing the right place, open permanently.
--- 1546,1552 ----
(widen)
(goto-char mk))
(if end-mk
! (push-mark end-mk t)
(if mark-active (setq mark-active)))
;; If hideshow got in the way of
;; seeing the right place, open permanently.
***************
*** 1561,1577 ****
compilation-highlight-regexp)))
(compilation-set-window-height w)
! (when (and highlight-regexp
! (not (and end-mk transient-mark-mode)))
(unless compilation-highlight-overlay
(setq compilation-highlight-overlay
(make-overlay (point-min) (point-min)))
(overlay-put compilation-highlight-overlay 'face 'next-error))
(with-current-buffer (marker-buffer mk)
(save-excursion
! (end-of-line)
(let ((end (point)))
! (beginning-of-line)
(if (and (stringp highlight-regexp)
(re-search-forward highlight-regexp end t))
(progn
--- 1567,1582 ----
compilation-highlight-regexp)))
(compilation-set-window-height w)
! (when highlight-regexp
(unless compilation-highlight-overlay
(setq compilation-highlight-overlay
(make-overlay (point-min) (point-min)))
(overlay-put compilation-highlight-overlay 'face 'next-error))
(with-current-buffer (marker-buffer mk)
(save-excursion
! (if end-mk (goto-char end-mk) (end-of-line))
(let ((end (point)))
! (if mk (goto-char mk) (beginning-of-line))
(if (and (stringp highlight-regexp)
(re-search-forward highlight-regexp end t))
(progn
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Juri Linkov, 2004/09/02
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Juri Linkov, 2004/09/02
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,
Juri Linkov <=
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Eli Zaretskii, 2004/09/04
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Juri Linkov, 2004/09/08
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Juri Linkov, 2004/09/08
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el, Daniel Pfeiffer, 2004/09/12