aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2002-02-06 15:25:15 +0000
committerRichard M. Stallman2002-02-06 15:25:15 +0000
commit4c01d4bda7dc8a8af9a63b6e6cb43bf716244460 (patch)
tree6c6b6bfa17d7c1880f3dac83b46ca438ee0ee5b5
parentb128536423cda9e4fd11e9449b011c474a746c2a (diff)
downloademacs-4c01d4bda7dc8a8af9a63b6e6cb43bf716244460.tar.gz
emacs-4c01d4bda7dc8a8af9a63b6e6cb43bf716244460.zip
(isearch-update): Don't update display in kbd macro.
(isearch-lazy-highlight-new-loop): Do nothing in kbd macro.
-rw-r--r--lisp/isearch.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index e03d5df0ea8..502285a357b 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -616,7 +616,8 @@ is treated as a regexp. See \\[isearch-forward] for more info."
616 616
617(defun isearch-update () 617(defun isearch-update ()
618 ;; Called after each command to update the display. 618 ;; Called after each command to update the display.
619 (if (null unread-command-events) 619 (if (and (null unread-command-events)
620 (null executing-kbd-macro))
620 (progn 621 (progn
621 (if (not (input-pending-p)) 622 (if (not (input-pending-p))
622 (isearch-message)) 623 (isearch-message))
@@ -2002,6 +2003,7 @@ is nil. This function is called when exiting an incremental search if
2002This happens when `isearch-update' is invoked (which can cause the 2003This happens when `isearch-update' is invoked (which can cause the
2003search string to change or the window to scroll)." 2004search string to change or the window to scroll)."
2004 (when (and isearch-lazy-highlight 2005 (when (and isearch-lazy-highlight
2006 (null executing-kbd-macro)
2005 (sit-for 0) ;make sure (window-start) is credible 2007 (sit-for 0) ;make sure (window-start) is credible
2006 (or (not (equal isearch-string 2008 (or (not (equal isearch-string
2007 isearch-lazy-highlight-last-string)) 2009 isearch-lazy-highlight-last-string))