2 files changed, 14 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95ab41b8a86..eea97f40a95 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-29  Juri Linkov  <juri@jurta.org>
+
+        * simple.el (next-error-highlight-timer): New variable.
+
+        * progmodes/compile.el (compilation-goto-locus):
+        Use `next-error-highlight-timer' instead of `sit-for'.
+
 2005-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * mail/supercite.el (sc-mail-field): Use assoc-string.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 457177d7c4c..bafc901d3d1 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1613,6 +1613,8 @@ and overlay is highlighted between MK and END-MK."
     (compilation-set-window-height w)
 
     (when highlight-regexp
+      (if (timerp next-error-highlight-timer)
+          (cancel-timer next-error-highlight-timer))
       (unless compilation-highlight-overlay
         (setq compilation-highlight-overlay
               (make-overlay (point-min) (point-min)))
@@ -1632,8 +1634,11 @@ and overlay is highlighted between MK and END-MK."
               (move-overlay compilation-highlight-overlay
                             (point) end (current-buffer)))
             (if (numberp next-error-highlight)
-                (sit-for next-error-highlight))
-            (if (not (eq next-error-highlight t))
+                (setq next-error-highlight-timer
+                      (run-at-time next-error-highlight nil 'delete-overlay
+                                   compilation-highlight-overlay)))
+            (if (not (or (eq next-error-highlight t)
+                         (numberp next-error-highlight)))
                 (delete-overlay compilation-highlight-overlay))))))
     (when (and (eq next-error-highlight 'fringe-arrow))
       (set (make-local-variable 'overlay-arrow-position)