Mercurial > emacs
diff lisp/progmodes/compile.el @ 90159:08185296b491
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-44
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 272-288)
- src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 67)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 05 May 2005 00:04:55 +0000 |
parents | 146c086df160 51f159119616 |
children | 62afea0771d8 |
line wrap: on
line diff
--- a/lisp/progmodes/compile.el Thu Apr 28 04:56:56 2005 +0000 +++ b/lisp/progmodes/compile.el Thu May 05 00:04:55 2005 +0000 @@ -710,7 +710,7 @@ `(,(car elt) (compilation-directory-properties ,(car elt) ,(cdr elt)) - t)) + t t)) (cdr compilation-directory-matcher))))) ;; Compiler warning/error lines. @@ -733,11 +733,12 @@ ;; allowed `line' to be a function that computed the actual ;; error location. Let's do our best. `(,(car item) - (0 (compilation-compat-error-properties - (funcall ',line (cons (match-string ,file) - (cons default-directory - ',(nthcdr 4 item))) - ,(if col `(match-string ,col))))) + (0 (save-match-data + (compilation-compat-error-properties + (funcall ',line (cons (match-string ,file) + (cons default-directory + ',(nthcdr 4 item))) + ,(if col `(match-string ,col)))))) (,file compilation-error-face t)) (unless (or (null (nth 5 item)) (integerp (nth 5 item))) @@ -1589,6 +1590,8 @@ (point)))) (set-window-point w mk)) +(defvar next-error-highlight-timer) + (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