Mercurial > emacs
comparison lisp/progmodes/compile.el @ 90133:4da4a09e8b1b
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-31
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 206-222)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 45-52)
- Update from CVS
- Update from CVS: texi Makefile.in CVS keyw cruft
- Update from CVS: ChangeLog tweaks
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 31 Mar 2005 09:58:14 +0000 |
parents | 29e773288013 e779ff0ee192 |
children | 02f1dbc4a199 |
comparison
equal
deleted
inserted
replaced
90132:4080fe8b4f0f | 90133:4da4a09e8b1b |
---|---|
1611 (compilation-set-window w msg) | 1611 (compilation-set-window w msg) |
1612 compilation-highlight-regexp))) | 1612 compilation-highlight-regexp))) |
1613 (compilation-set-window-height w) | 1613 (compilation-set-window-height w) |
1614 | 1614 |
1615 (when highlight-regexp | 1615 (when highlight-regexp |
1616 (if (timerp next-error-highlight-timer) | |
1617 (cancel-timer next-error-highlight-timer)) | |
1616 (unless compilation-highlight-overlay | 1618 (unless compilation-highlight-overlay |
1617 (setq compilation-highlight-overlay | 1619 (setq compilation-highlight-overlay |
1618 (make-overlay (point-min) (point-min))) | 1620 (make-overlay (point-min) (point-min))) |
1619 (overlay-put compilation-highlight-overlay 'face 'next-error)) | 1621 (overlay-put compilation-highlight-overlay 'face 'next-error)) |
1620 (with-current-buffer (marker-buffer mk) | 1622 (with-current-buffer (marker-buffer mk) |
1630 (match-beginning 0) (match-end 0) | 1632 (match-beginning 0) (match-end 0) |
1631 (current-buffer))) | 1633 (current-buffer))) |
1632 (move-overlay compilation-highlight-overlay | 1634 (move-overlay compilation-highlight-overlay |
1633 (point) end (current-buffer))) | 1635 (point) end (current-buffer))) |
1634 (if (numberp next-error-highlight) | 1636 (if (numberp next-error-highlight) |
1635 (sit-for next-error-highlight)) | 1637 (setq next-error-highlight-timer |
1636 (if (not (eq next-error-highlight t)) | 1638 (run-at-time next-error-highlight nil 'delete-overlay |
1639 compilation-highlight-overlay))) | |
1640 (if (not (or (eq next-error-highlight t) | |
1641 (numberp next-error-highlight))) | |
1637 (delete-overlay compilation-highlight-overlay)))))) | 1642 (delete-overlay compilation-highlight-overlay)))))) |
1638 (when (and (eq next-error-highlight 'fringe-arrow)) | 1643 (when (and (eq next-error-highlight 'fringe-arrow)) |
1639 (set (make-local-variable 'overlay-arrow-position) | 1644 (set (make-local-variable 'overlay-arrow-position) |
1640 (copy-marker (line-beginning-position)))))) | 1645 (copy-marker (line-beginning-position)))))) |
1641 | 1646 |