Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
90158:bf4846baba9a | 90159:08185296b491 |
---|---|
708 `((,(car compilation-directory-matcher) | 708 `((,(car compilation-directory-matcher) |
709 ,@(mapcar (lambda (elt) | 709 ,@(mapcar (lambda (elt) |
710 `(,(car elt) | 710 `(,(car elt) |
711 (compilation-directory-properties | 711 (compilation-directory-properties |
712 ,(car elt) ,(cdr elt)) | 712 ,(car elt) ,(cdr elt)) |
713 t)) | 713 t t)) |
714 (cdr compilation-directory-matcher))))) | 714 (cdr compilation-directory-matcher))))) |
715 | 715 |
716 ;; Compiler warning/error lines. | 716 ;; Compiler warning/error lines. |
717 (mapcar | 717 (mapcar |
718 (lambda (item) | 718 (lambda (item) |
731 (if (functionp line) | 731 (if (functionp line) |
732 ;; The old compile.el had here an undocumented hook that | 732 ;; The old compile.el had here an undocumented hook that |
733 ;; allowed `line' to be a function that computed the actual | 733 ;; allowed `line' to be a function that computed the actual |
734 ;; error location. Let's do our best. | 734 ;; error location. Let's do our best. |
735 `(,(car item) | 735 `(,(car item) |
736 (0 (compilation-compat-error-properties | 736 (0 (save-match-data |
737 (funcall ',line (cons (match-string ,file) | 737 (compilation-compat-error-properties |
738 (cons default-directory | 738 (funcall ',line (cons (match-string ,file) |
739 ',(nthcdr 4 item))) | 739 (cons default-directory |
740 ,(if col `(match-string ,col))))) | 740 ',(nthcdr 4 item))) |
741 ,(if col `(match-string ,col)))))) | |
741 (,file compilation-error-face t)) | 742 (,file compilation-error-face t)) |
742 | 743 |
743 (unless (or (null (nth 5 item)) (integerp (nth 5 item))) | 744 (unless (or (null (nth 5 item)) (integerp (nth 5 item))) |
744 (error "HYPERLINK should be an integer: %s" (nth 5 item))) | 745 (error "HYPERLINK should be an integer: %s" (nth 5 item))) |
745 | 746 |
1587 (goto-char mk) | 1588 (goto-char mk) |
1588 (beginning-of-line (- 1 compilation-context-lines)) | 1589 (beginning-of-line (- 1 compilation-context-lines)) |
1589 (point)))) | 1590 (point)))) |
1590 (set-window-point w mk)) | 1591 (set-window-point w mk)) |
1591 | 1592 |
1593 (defvar next-error-highlight-timer) | |
1594 | |
1592 (defun compilation-goto-locus (msg mk end-mk) | 1595 (defun compilation-goto-locus (msg mk end-mk) |
1593 "Jump to an error corresponding to MSG at MK. | 1596 "Jump to an error corresponding to MSG at MK. |
1594 All arguments are markers. If END-MK is non-nil, mark is set there | 1597 All arguments are markers. If END-MK is non-nil, mark is set there |
1595 and overlay is highlighted between MK and END-MK." | 1598 and overlay is highlighted between MK and END-MK." |
1596 (if (eq (window-buffer (selected-window)) | 1599 (if (eq (window-buffer (selected-window)) |