X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/9c1db9293cae2b1b0a3b6a5f0e55e75a9bf1bcdf..ba976213c358271b653ae2a8fec9d09c6692a7fd:/lisp/isearch.el diff --git a/lisp/isearch.el b/lisp/isearch.el index 538cb6a3ed..fbc62e8739 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -1,9 +1,11 @@ ;;; isearch.el --- incremental search minor mode. -;; Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. +;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1999, 2000, 2001 +;; Free Software Foundation, Inc. ;; Author: Daniel LaLiberte ;; Maintainer: FSF +;; Keywords: matching ;; This file is part of GNU Emacs. @@ -28,8 +30,7 @@ ;; For programmed use of isearch-mode, e.g. calling (isearch-forward), ;; isearch-mode behaves modally and does not return until the search -;; is completed. It uses a recursive-edit to behave this way. Note: -;; gnus does it wrong: (call-interactively 'isearch-forward). +;; is completed. It uses a recursive-edit to behave this way. ;; The key bindings active within isearch-mode are defined below in ;; `isearch-mode-map' which is given bindings close to the default @@ -39,11 +40,9 @@ ;; be longer than two chars. Also see minibuffer-local-isearch-map ;; for bindings active during `isearch-edit-string'. -;; Note to emacs version 19 users: isearch-mode should work even if -;; you switch windows with the mouse, in which case isearch-mode is -;; terminated automatically before the switch. This is true of lemacs -;; too, with a few more cleanups I've neglected in this release. -;; No one has supplied patches for epoch yet. +;; isearch-mode should work even if you switch windows with the mouse, +;; in which case isearch-mode is terminated automatically before the +;; switch. ;; The search ring and completion commands automatically put you in ;; the minibuffer to edit the string. This gives you a chance to @@ -107,6 +106,8 @@ (defgroup isearch nil "Incremental search minor mode." + :link '(emacs-commentary-link "isearch") + :link '(custom-manual "(emacs)Incremental Search") :prefix "isearch-" :prefix "search-" :group 'matching) @@ -140,7 +141,7 @@ apply to chars in regexps that are prefixed with `\\'. If this value is `not-yanks', yanked text is always downcased." :type '(choice (const :tag "off" nil) (const not-yanks) - (sexp :tag "on" :format "%t\n" t)) + (other :tag "on" t)) :group 'isearch) (defcustom search-nonincremental-instead t @@ -152,18 +153,38 @@ string, and RET terminates editing and does a nonincremental search." (defcustom search-whitespace-regexp "\\s-+" "*If non-nil, regular expression to match a sequence of whitespace chars. -You might want to use something like \"[ \\t\\r\\n]+\" instead." +This applies to regular expression incremental search. +You might want to use something like \"[ \\t\\r\\n]+\" instead. +In the Customization buffer, that is `[' followed by a space, +a tab, a carriage return (control-M), a newline, and `]+'." :type 'regexp :group 'isearch) -(defcustom search-highlight nil +(defcustom search-highlight t "*Non-nil means incremental search highlights the current match." :type 'boolean :group 'isearch) -(defvar search-invisible nil - "*Non-nil means incremental search can match text hidden by an overlay. -\(This applies when using `noutline.el'.)") +(defcustom search-invisible 'open + "If t incremental search can match hidden text. +nil means don't match invisible text. +If the value is `open', if the text matched is made invisible by +an overlay having an `invisible' property and that overlay has a property +`isearch-open-invisible', then incremental search will show the contents. +\(This applies when using `outline.el' and `hideshow.el'.)" + :type '(choice (const :tag "Match hidden text" t) + (const :tag "Open overlays" open) + (const :tag "Don't match hidden text" nil)) + :group 'isearch) + +(defcustom isearch-hide-immediately t + "If non-nil, re-hide an invisible match right away. +This variable makes a difference when `search-invisible' is set to `open'. +It means that after search makes some invisible text visible +to show the match, it makes the text invisible again when the match moves. +Ordinarily the text becomes invisible again at the end of the search." + :type 'boolean + :group 'isearch) (defvar isearch-mode-hook nil "Function(s) to call after starting up an incremental search.") @@ -202,116 +223,124 @@ Default value, nil, means edit the string instead." ;;; Define isearch-mode keymap. -(defvar isearch-mode-map nil - "Keymap for isearch-mode.") - -(or isearch-mode-map - (let* ((i 0) - (map (make-keymap))) - (or (vectorp (nth 1 map)) - (error "The initialization of isearch-mode-map must be updated")) - ;; Give this map a vector 256 long, for dense binding - ;; of a larger range of ordinary characters. - (setcar (cdr map) (make-vector 256 nil)) - - ;; Make function keys, etc, exit the search. - (define-key map [t] 'isearch-other-control-char) - ;; Control chars, by default, end isearch mode transparently. - ;; We need these explicit definitions because, in a dense keymap, - ;; the binding for t does not affect characters. - ;; We use a dense keymap to save space. - (while (< i ?\ ) - (define-key map (make-string 1 i) 'isearch-other-control-char) - (setq i (1+ i))) - - ;; Printing chars extend the search string by default. - (setq i ?\ ) - (while (< i (length (nth 1 map))) - (define-key map (vector i) 'isearch-printing-char) - (setq i (1+ i))) - - ;; To handle local bindings with meta char prefix keys, define - ;; another full keymap. This must be done for any other prefix - ;; keys as well, one full keymap per char of the prefix key. It - ;; would be simpler to disable the global keymap, and/or have a - ;; default local key binding for any key not otherwise bound. - (let ((meta-map (make-sparse-keymap))) - (define-key map (char-to-string meta-prefix-char) meta-map) - (define-key map [escape] meta-map)) - (define-key map (vector meta-prefix-char t) 'isearch-other-meta-char) - - ;; Several non-printing chars change the searching behavior. - (define-key map "\C-s" 'isearch-repeat-forward) - (define-key map "\C-r" 'isearch-repeat-backward) - (define-key map "\177" 'isearch-delete-char) - (define-key map "\C-g" 'isearch-abort) - ;; This assumes \e is the meta-prefix-char. - (or (= ?\e meta-prefix-char) - (error "Inconsistency in isearch.el")) - (define-key map "\e\e\e" 'isearch-cancel) - (define-key map [escape escape escape] 'isearch-cancel) +(defvar isearch-mode-map + (let* ((i 0) + (map (make-keymap))) + (or (vectorp (nth 1 map)) + (char-table-p (nth 1 map)) + (error "The initialization of isearch-mode-map must be updated")) + ;; Make all multibyte characters search for themselves. + (let ((l (generic-character-list)) + (table (nth 1 map))) + (while l + (set-char-table-default table (car l) 'isearch-printing-char) + (setq l (cdr l)))) + ;; Make function keys, etc, exit the search. + (define-key map [t] 'isearch-other-control-char) + ;; Control chars, by default, end isearch mode transparently. + ;; We need these explicit definitions because, in a dense keymap, + ;; the binding for t does not affect characters. + ;; We use a dense keymap to save space. + (while (< i ?\ ) + (define-key map (make-string 1 i) 'isearch-other-control-char) + (setq i (1+ i))) + + ;; Single-byte printing chars extend the search string by default. + (setq i ?\ ) + (while (< i 256) + (define-key map (vector i) 'isearch-printing-char) + (setq i (1+ i))) + + ;; To handle local bindings with meta char prefix keys, define + ;; another full keymap. This must be done for any other prefix + ;; keys as well, one full keymap per char of the prefix key. It + ;; would be simpler to disable the global keymap, and/or have a + ;; default local key binding for any key not otherwise bound. + (let ((meta-map (make-sparse-keymap))) + (define-key map (char-to-string meta-prefix-char) meta-map) + (define-key map [escape] meta-map)) + (define-key map (vector meta-prefix-char t) 'isearch-other-meta-char) + + ;; Several non-printing chars change the searching behavior. + (define-key map "\C-s" 'isearch-repeat-forward) + (define-key map "\C-r" 'isearch-repeat-backward) + ;; Define M-C-s and M-C-r like C-s and C-r so that the same key + ;; combinations can be used to repeat regexp isearches that can + ;; be used to start these searches. + (define-key map "\M-\C-s" 'isearch-repeat-forward) + (define-key map "\M-\C-r" 'isearch-repeat-backward) + (define-key map "\177" 'isearch-delete-char) + (define-key map "\C-g" 'isearch-abort) + + ;; This assumes \e is the meta-prefix-char. + (or (= ?\e meta-prefix-char) + (error "Inconsistency in isearch.el")) + (define-key map "\e\e\e" 'isearch-cancel) + (define-key map [escape escape escape] 'isearch-cancel) - (define-key map "\C-q" 'isearch-quote-char) + (define-key map "\C-q" 'isearch-quote-char) - (define-key map "\r" 'isearch-exit) - (define-key map "\C-j" 'isearch-printing-char) - (define-key map "\t" 'isearch-printing-char) - (define-key map " " 'isearch-whitespace-chars) + (define-key map "\r" 'isearch-exit) + (define-key map "\C-j" 'isearch-printing-char) + (define-key map "\t" 'isearch-printing-char) + (define-key map " " 'isearch-whitespace-chars) + (define-key map [?\S-\ ] 'isearch-whitespace-chars) - (define-key map "\C-w" 'isearch-yank-word) - (define-key map "\C-y" 'isearch-yank-line) + (define-key map "\C-w" 'isearch-yank-word) + (define-key map "\C-y" 'isearch-yank-line) - ;; Define keys for regexp chars * ? |. - ;; Nothing special for + because it matches at least once. - (define-key map "*" 'isearch-*-char) - (define-key map "?" 'isearch-*-char) - (define-key map "|" 'isearch-|-char) + ;; Define keys for regexp chars * ? |. + ;; Nothing special for + because it matches at least once. + (define-key map "*" 'isearch-*-char) + (define-key map "?" 'isearch-*-char) + (define-key map "|" 'isearch-|-char) ;;; Turned off because I find I expect to get the global definition--rms. ;;; ;; Instead bind C-h to special help command for isearch-mode. ;;; (define-key map "\C-h" 'isearch-mode-help) - (define-key map "\M-n" 'isearch-ring-advance) - (define-key map "\M-p" 'isearch-ring-retreat) - (define-key map "\M-y" 'isearch-yank-kill) - - (define-key map "\M-\t" 'isearch-complete) - - ;; Pass frame events transparently so they won't exit the search. - ;; In particular, if we have more than one display open, then a - ;; switch-frame might be generated by someone typing at another keyboard. - (define-key map [switch-frame] nil) - (define-key map [delete-frame] nil) - (define-key map [iconify-frame] nil) - (define-key map [make-frame-visible] nil) - ;; For searching multilingual text. - (define-key map "\C-\\" 'isearch-toggle-input-method) - (define-key map "\C-^" 'isearch-toggle-specified-input-method) - - (setq isearch-mode-map map) - )) - -;; Some bindings you may want to put in your isearch-mode-hook. -;; Suggest some alternates... -;; (define-key isearch-mode-map "\C-t" 'isearch-toggle-case-fold) -;; (define-key isearch-mode-map "\C-t" 'isearch-toggle-regexp) -;; (define-key isearch-mode-map "\C-^" 'isearch-edit-string) - - -(defvar minibuffer-local-isearch-map nil + (define-key map "\M-n" 'isearch-ring-advance) + (define-key map "\M-p" 'isearch-ring-retreat) + (define-key map "\M-y" 'isearch-yank-kill) + + (define-key map "\M-\t" 'isearch-complete) + + ;; Pass frame events transparently so they won't exit the search. + ;; In particular, if we have more than one display open, then a + ;; switch-frame might be generated by someone typing at another keyboard. + (define-key map [switch-frame] nil) + (define-key map [delete-frame] nil) + (define-key map [iconify-frame] nil) + (define-key map [make-frame-visible] nil) + ;; For searching multilingual text. + (define-key map "\C-\\" 'isearch-toggle-input-method) + (define-key map "\C-^" 'isearch-toggle-specified-input-method) + + ;; People expect to be able to paste with the mouse. + (define-key map [mouse-2] #'isearch-mouse-yank) + (define-key map [down-mouse-2] nil) + + ;; Some bindings you may want to put in your isearch-mode-hook. + ;; Suggest some alternates... + (define-key map "\M-c" 'isearch-toggle-case-fold) + (define-key map "\M-r" 'isearch-toggle-regexp) + (define-key map "\M-e" 'isearch-edit-string) + + map) + "Keymap for `isearch-mode'.") + +(defvar minibuffer-local-isearch-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent map minibuffer-local-map) + (define-key map "\r" 'isearch-nonincremental-exit-minibuffer) + (define-key map "\M-n" 'isearch-ring-advance-edit) + (define-key map "\M-p" 'isearch-ring-retreat-edit) + (define-key map "\M-\t" 'isearch-complete-edit) + (define-key map "\C-s" 'isearch-forward-exit-minibuffer) + (define-key map "\C-r" 'isearch-reverse-exit-minibuffer) + map) "Keymap for editing isearch strings in the minibuffer.") -(or minibuffer-local-isearch-map - (let ((map (copy-keymap minibuffer-local-map))) - (define-key map "\r" 'isearch-nonincremental-exit-minibuffer) - (define-key map "\M-n" 'isearch-ring-advance-edit) - (define-key map "\M-p" 'isearch-ring-retreat-edit) - (define-key map "\M-\t" 'isearch-complete-edit) - (define-key map "\C-s" 'isearch-forward-exit-minibuffer) - (define-key map "\C-r" 'isearch-reverse-exit-minibuffer) - (setq minibuffer-local-isearch-map map) - )) - ;; Internal variables declared globally for byte-compiler. ;; These are all set with setq while isearching ;; and bound locally while editing the search string. @@ -337,6 +366,9 @@ Default value, nil, means edit the string instead." ; case in the search string is ignored. (defvar isearch-case-fold-search nil) +;; Used to save default value while isearch is active +(defvar isearch-original-minibuffer-message-timeout nil) + (defvar isearch-adjusted nil) (defvar isearch-slow-terminal-mode nil) ;;; If t, using a small window. @@ -348,9 +380,6 @@ Default value, nil, means edit the string instead." ;; Flag to indicate a yank occurred, so don't move the cursor. (defvar isearch-yank-flag nil) -;; Flag to indicate that we are searching multibyte characaters. -(defvar isearch-multibyte-characters-flag nil) - ;;; A function to be called after each input character is processed. ;;; (It is not called after characters that exit the search.) ;;; It is only set from an optional argument to `isearch-mode'. @@ -365,6 +394,15 @@ Default value, nil, means edit the string instead." ;; New value of isearch-forward after isearch-edit-string. (defvar isearch-new-forward nil) +;; Accumulate here the overlays opened during searching. +(defvar isearch-opened-overlays nil) + +;; The value of input-method-function when isearch is invoked. +(defvar isearch-input-method-function nil) + +;; A flag to tell if input-method-function is locally bound when +;; isearch is invoked. +(defvar isearch-input-method-local-p nil) ;; Minor-mode-alist changes - kind of redundant with the ;; echo area, but if isearching in multiple windows, it can be useful. @@ -382,9 +420,6 @@ Default value, nil, means edit the string instead." (define-key esc-map "\C-r" 'isearch-backward-regexp) ;;; Entry points to isearch-mode. -;;; These four functions should replace those in loaddefs.el -;;; An alternative is to defalias isearch-forward etc to isearch-mode, -;;; and look at this-command to set the options accordingly. (defun isearch-forward (&optional regexp-p no-recursive-edit) "\ @@ -403,7 +438,8 @@ Type \\[isearch-yank-word] to yank word from buffer onto end of search\ string and search for it. Type \\[isearch-yank-line] to yank rest of line onto end of search string\ and search for it. -Type \\[isearch-yank-kill] to yank the last string of killed text. +Type \\[isearch-yank-kill] to yank last killed text onto end of search string\ + and search for it. Type \\[isearch-quote-char] to quote control character to search for it. \\[isearch-abort] while searching or when search has failed cancels input\ back to what has @@ -498,11 +534,26 @@ is treated as a regexp. See \\[isearch-forward] for more info." isearch-other-end nil isearch-small-window nil isearch-just-started t - isearch-multibyte-characters-flag nil isearch-opoint (point) search-ring-yank-pointer nil - regexp-search-ring-yank-pointer nil) + isearch-opened-overlays nil + isearch-input-method-function input-method-function + isearch-input-method-local-p (local-variable-p 'input-method-function) + regexp-search-ring-yank-pointer nil + + ;; Save the original value of `minibuffer-message-timeout', and + ;; set it to nil so that isearch's messages don't get timed out. + isearch-original-minibuffer-message-timeout minibuffer-message-timeout + minibuffer-message-timeout nil) + + ;; We must bypass input method while reading key. When a user type + ;; printable character, appropriate input method is turned on in + ;; minibuffer to read multibyte characters. + (or isearch-input-method-local-p + (make-local-variable 'input-method-function)) + (setq input-method-function nil) + (looking-at "") (setq isearch-window-configuration (if isearch-slow-terminal-mode (current-window-configuration) nil)) @@ -525,6 +576,7 @@ is treated as a regexp. See \\[isearch-forward] for more info." (run-hooks 'isearch-mode-hook) (add-hook 'mouse-leave-buffer-hook 'isearch-done) + (add-hook 'kbd-macro-termination-hook 'isearch-done) ;; isearch-mode can be made modal (in the sense of not returning to ;; the calling function until searching is completed) by entering @@ -541,45 +593,60 @@ is treated as a regexp. See \\[isearch-forward] for more info." ;; Called after each command to update the display. (if (null unread-command-events) (progn - (if (not (input-pending-p)) - (isearch-message)) - (if (and isearch-slow-terminal-mode - (not (or isearch-small-window - (pos-visible-in-window-p)))) - (let ((found-point (point))) - (setq isearch-small-window t) - (move-to-window-line 0) - (let ((window-min-height 1)) - (split-window nil (if (< search-slow-window-lines 0) - (1+ (- search-slow-window-lines)) - (- (window-height) - (1+ search-slow-window-lines))))) - (if (< search-slow-window-lines 0) - (progn (vertical-motion (- 1 search-slow-window-lines)) - (set-window-start (next-window) (point)) - (set-window-hscroll (next-window) - (window-hscroll)) - (set-window-hscroll (selected-window) 0)) - (other-window 1)) - (goto-char found-point))) - (if isearch-other-end - (if (< isearch-other-end (point)) ; isearch-forward? - (isearch-highlight isearch-other-end (point)) - (isearch-highlight (point) isearch-other-end)) - (isearch-dehighlight nil)) - )) + (if (not (input-pending-p)) + (isearch-message)) + (if (and isearch-slow-terminal-mode + (not (or isearch-small-window + (pos-visible-in-window-p)))) + (let ((found-point (point))) + (setq isearch-small-window t) + (move-to-window-line 0) + (let ((window-min-height 1)) + (split-window nil (if (< search-slow-window-lines 0) + (1+ (- search-slow-window-lines)) + (- (window-height) + (1+ search-slow-window-lines))))) + (if (< search-slow-window-lines 0) + (progn (vertical-motion (- 1 search-slow-window-lines)) + (set-window-start (next-window) (point)) + (set-window-hscroll (next-window) + (window-hscroll)) + (set-window-hscroll (selected-window) 0)) + (other-window 1)) + (goto-char found-point))) + (if isearch-other-end + (if (< isearch-other-end (point)) ; isearch-forward? + (isearch-highlight isearch-other-end (point)) + (isearch-highlight (point) isearch-other-end)) + (isearch-dehighlight nil)) + )) (setq ;; quit-flag nil not for isearch-mode isearch-adjusted nil isearch-yank-flag nil) - ) + (isearch-lazy-highlight-new-loop) + ;; We must prevent the point moving to the end of composition when a + ;; part of the composition has just been searched. + (setq disable-point-adjustment t)) (defun isearch-done (&optional nopush edit) + (let ((command `(isearch-resume ,isearch-string ,isearch-regexp + ,isearch-word ,isearch-forward + ,isearch-message + ,isearch-case-fold-search))) + (unless (equal (car command-history) command) + (setq command-history (cons command command-history)))) + (remove-hook 'mouse-leave-buffer-hook 'isearch-done) + (remove-hook 'kbd-macro-termination-hook 'isearch-done) + (setq isearch-lazy-highlight-start nil) + ;; Called by all commands that terminate isearch-mode. ;; If NOPUSH is non-nil, we don't push the string on the search ring. (setq overriding-terminal-local-map nil) ;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs + (setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout) (isearch-dehighlight t) + (isearch-lazy-highlight-cleanup isearch-lazy-highlight-cleanup) (let ((found-start (window-start (selected-window))) (found-point (point))) (if isearch-window-configuration @@ -600,8 +667,23 @@ is treated as a regexp. See \\[isearch-forward] for more info." (message "Mark saved where search started")))))) (setq isearch-mode nil) + (if isearch-input-method-local-p + (setq input-method-function isearch-input-method-function) + (kill-local-variable 'input-method-function)) + (force-mode-line-update) + ;; If we ended in the middle of some intangible text, + ;; move to the further end of that intangible text. + (let ((after (if (eobp) nil + (get-text-property (point) 'intangible))) + (before (if (bobp) nil + (get-text-property (1- (point)) 'intangible)))) + (when (and before after (eq before after)) + (if isearch-forward + (goto-char (next-single-property-change (point) 'intangible)) + (goto-char (previous-single-property-change (point) 'intangible))))) + (if (and (> (length isearch-string) 0) (not nopush)) ;; Update the ring data. (isearch-update-ring isearch-string isearch-regexp)) @@ -629,15 +711,13 @@ REGEXP says which ring to use." (setcdr (nthcdr (1- search-ring-max) search-ring) nil)))))) ;;; Switching buffers should first terminate isearch-mode. -;;; This is done quite differently for each variant of emacs. -;;; For lemacs, see Exiting in lemacs below - -;; For Emacs 19, the frame switch event is handled. -(defun isearch-switch-frame-handler () - (interactive) ;; Is this necessary? - ;; First terminate isearch-mode. - (isearch-done) - (handle-switch-frame (car (cdr (isearch-last-command-char))))) +;;; ;; For Emacs 19, the frame switch event is handled. +;;; (defun isearch-switch-frame-handler () +;;; (interactive) ;; Is this necessary? +;;; ;; First terminate isearch-mode. +;;; (isearch-done) +;;; (isearch-clean-overlays) +;;; (handle-switch-frame (car (cdr last-command-char)))) ;; Commands active while inside of the isearch minor mode. @@ -652,7 +732,8 @@ nonincremental search instead via `isearch-edit-string'." (= 0 (length isearch-string))) (let ((isearch-nonincremental t)) (isearch-edit-string))) - (isearch-done)) + (isearch-done) + (isearch-clean-overlays)) (defun isearch-edit-string () @@ -710,6 +791,12 @@ If first char entered is \\[isearch-yank-word], then do word search instead." (isearch-recursive-edit isearch-recursive-edit) ;; Save current configuration so we can restore it here. (isearch-window-configuration (current-window-configuration)) + + ;; Temporarily restore `minibuffer-message-timeout'. + (minibuffer-message-timeout + isearch-original-minibuffer-message-timeout) + (isearch-original-minibuffer-message-timeout + isearch-original-minibuffer-message-timeout) ) ;; Actually terminate isearching until editing is done. @@ -812,6 +899,7 @@ If first char entered is \\[isearch-yank-word], then do word search instead." (interactive) (goto-char isearch-opoint) (isearch-done t) + (isearch-clean-overlays) (signal 'quit nil)) ; and pass on quit signal (defun isearch-abort () @@ -827,6 +915,7 @@ Use `isearch-exit' to quit without signaling." (progn (goto-char isearch-opoint) (setq isearch-success nil) (isearch-done t) ; exit isearch + (isearch-clean-overlays) (signal 'quit nil)) ; and pass on quit signal ;; If search is failing, or has an incomplete regexp, ;; rub out until it is once more successful. @@ -850,7 +939,7 @@ Use `isearch-exit' to quit without signaling." isearch-string "")) ;; If already have what to search for, repeat it. (or isearch-success - (progn + (progn (goto-char (if isearch-forward (point-min) (point-max))) (setq isearch-wrapped t)))) ;; C-s in reverse or C-r in forward, change direction. @@ -918,55 +1007,61 @@ If no previous match was done, just beep." (isearch-update)) -(defun isearch-yank (chunk) - ;; Helper for isearch-yank-word and isearch-yank-line - ;; CHUNK should be word, line, kill, or x-sel. - (let ((string (cond - ((eq chunk 'kill) - (current-kill 0)) - ((eq chunk 'x-sel) - (x-get-selection)) - (t - (save-excursion - (and (not isearch-forward) isearch-other-end - (goto-char isearch-other-end)) - (buffer-substring - (point) - (save-excursion - (cond - ((eq chunk 'word) - (forward-word 1)) - ((eq chunk 'line) - (end-of-line))) - (point)))))))) - ;; Downcase the string if not supposed to case-fold yanked strings. - (if (and isearch-case-fold-search - (eq 'not-yanks search-upper-case)) - (setq string (downcase string))) - (if isearch-regexp (setq string (regexp-quote string))) - (setq isearch-string (concat isearch-string string) - isearch-message - (concat isearch-message - (mapconcat 'isearch-text-char-description - string "")) - ;; Don't move cursor in reverse search. - isearch-yank-flag t)) +(defun isearch-yank-string (string) + "Pull STRING into search string." + ;; Downcase the string if not supposed to case-fold yanked strings. + (if (and isearch-case-fold-search + (eq 'not-yanks search-upper-case)) + (setq string (downcase string))) + (if isearch-regexp (setq string (regexp-quote string))) + (setq isearch-string (concat isearch-string string) + isearch-message + (concat isearch-message + (mapconcat 'isearch-text-char-description + string "")) + ;; Don't move cursor in reverse search. + isearch-yank-flag t) (isearch-search-and-update)) (defun isearch-yank-kill () "Pull string from kill ring into search string." (interactive) - (isearch-yank 'kill)) + (isearch-yank-string (current-kill 0))) + +(defun isearch-yank-x-selection () + "Pull current X selection into search string." + (interactive) + (isearch-yank-string (x-get-selection))) + +(defun isearch-mouse-yank (click arg) + "Yank with the mouse in Isearch mode. +For a click in the echo area, invoke `isearch-yank-x-selection'. +Otherwise invoke `mouse-yank-at-click'." + (interactive "e\nP") + (let ((w (posn-window (event-start click)))) + (if (and (window-minibuffer-p w) + (not (minibuffer-window-active-p w))) ; in echo area + (isearch-yank-x-selection) + (mouse-yank-at-click click arg)))) (defun isearch-yank-word () "Pull next word from buffer into search string." (interactive) - (isearch-yank 'word)) + (isearch-yank-string + (save-excursion + (and (not isearch-forward) isearch-other-end + (goto-char isearch-other-end)) + (buffer-substring-no-properties + (point) (progn (forward-word 1) (point)))))) (defun isearch-yank-line () "Pull rest of line from buffer into search string." (interactive) - (isearch-yank 'line)) + (isearch-yank-string + (save-excursion + (and (not isearch-forward) isearch-other-end + (goto-char isearch-other-end)) + (buffer-substring-no-properties (point) (line-end-position))))) (defun isearch-search-and-update () @@ -985,16 +1080,23 @@ If no previous match was done, just beep." (if (and (not isearch-forward) (not isearch-adjusted) (condition-case () (let ((case-fold-search isearch-case-fold-search)) + (if (and (eq case-fold-search t) search-upper-case) + (setq case-fold-search + (isearch-no-upper-case-p isearch-string isearch-regexp))) (looking-at (if isearch-regexp isearch-string (regexp-quote isearch-string)))) (error nil)) - (or isearch-yank-flag - (<= (match-end 0) - (min isearch-opoint isearch-barrier)))) - (setq isearch-success t - isearch-invalid-regexp nil - isearch-within-brackets nil - isearch-other-end (match-end 0)) + (or isearch-yank-flag + (<= (match-end 0) + (min isearch-opoint isearch-barrier)))) + (progn + (setq isearch-success t + isearch-invalid-regexp nil + isearch-within-brackets nil + isearch-other-end (match-end 0)) + (if (and (eq isearch-case-fold-search t) search-upper-case) + (setq isearch-case-fold-search + (isearch-no-upper-case-p isearch-string isearch-regexp)))) ;; Not regexp, not reverse, or no match at point. (if (and isearch-other-end (not isearch-adjusted)) (goto-char (if isearch-forward isearch-other-end @@ -1018,21 +1120,24 @@ If no previous match was done, just beep." "Handle * and ? specially in regexps." (interactive) (if isearch-regexp - - (progn - (setq isearch-adjusted t) - ;; Get the isearch-other-end from before the last search. - ;; We want to start from there, - ;; so that we don't retreat farther than that. - ;; (car isearch-cmds) is after last search; - ;; (car (cdr isearch-cmds)) is from before it. - (let ((cs (nth 5 (car (cdr isearch-cmds))))) - (setq cs (or cs isearch-barrier)) - (goto-char - (if isearch-forward - (max cs isearch-barrier) - (min cs isearch-barrier)))))) - (isearch-process-search-char (isearch-last-command-char))) + (let ((idx (length isearch-string))) + (while (and (> idx 0) + (eq (aref isearch-string (1- idx)) ?\\)) + (setq idx (1- idx))) + (when (= (mod (- (length isearch-string) idx) 2) 0) + (setq isearch-adjusted t) + ;; Get the isearch-other-end from before the last search. + ;; We want to start from there, + ;; so that we don't retreat farther than that. + ;; (car isearch-cmds) is after last search; + ;; (car (cdr isearch-cmds)) is from before it. + (let ((cs (nth 5 (car (cdr isearch-cmds))))) + (setq cs (or cs isearch-barrier)) + (goto-char + (if isearch-forward + (max cs isearch-barrier) + (min cs isearch-barrier))))))) + (isearch-process-search-char last-command-char)) (defun isearch-|-char () @@ -1042,7 +1147,7 @@ If no previous match was done, just beep." (progn (setq isearch-adjusted t) (goto-char isearch-barrier))) - (isearch-process-search-char (isearch-last-command-char))) + (isearch-process-search-char last-command-char)) (defalias 'isearch-other-control-char 'isearch-other-meta-char) @@ -1067,11 +1172,25 @@ and the meta character is unread so that it applies to editing the string." ;; so that the translated key takes effect within isearch. (cancel-kbd-macro-events) (if (lookup-key global-map key) - (progn + (progn (isearch-done) (apply 'isearch-unread keylist)) - (apply 'isearch-unread - (listify-key-sequence (lookup-key function-key-map key))))) + (setq keylist + (listify-key-sequence (lookup-key function-key-map key))) + (while keylist + (setq key (car keylist)) + ;; If KEY is a printing char, we handle it here + ;; directly to avoid the input method and keyboard + ;; coding system translating it. + (if (and (integerp key) + (>= key ?\ ) (/= key 127) (< key 256)) + (progn + (isearch-process-search-char key) + (setq keylist (cdr keylist))) + ;; As the remaining keys in KEYLIST can't be handled + ;; here, we must reread them. + (apply 'isearch-unread keylist) + (setq keylist nil))))) ( ;; Handle an undefined shifted control character ;; by downshifting it if that makes it defined. @@ -1116,18 +1235,30 @@ and the meta character is unread so that it applies to editing the string." ;; is in isearch mode. So end the search in that buffer. (if (and (listp main-event) (setq window (posn-window (event-start main-event))) - (windowp window)) + (windowp window) + (or (> (minibuffer-depth) 0) + (not (window-minibuffer-p window)))) (save-excursion (set-buffer (window-buffer window)) - (isearch-done)) - (isearch-done)))) + (isearch-done) + (isearch-clean-overlays)) + (isearch-done) + (isearch-clean-overlays)))) (t;; otherwise nil (isearch-process-search-string key key))))) (defun isearch-quote-char () "Quote special characters for incremental search." (interactive) - (isearch-process-search-char (read-quoted-char (isearch-message t)))) + (let ((char (read-quoted-char (isearch-message t)))) + ;; Assume character codes 0200 - 0377 stand for characters in some + ;; single-byte character set, and convert them to Emacs + ;; characters. + (and enable-multibyte-characters + (>= char ?\200) + (<= char ?\377) + (setq char (unibyte-char-to-multibyte char))) + (isearch-process-search-char char))) (defun isearch-return-char () "Convert return into newline for incremental search. @@ -1138,13 +1269,22 @@ Obsolete." (defun isearch-printing-char () "Add this ordinary printing character to the search string and search." (interactive) - (if isearch-multibyte-characters-flag - (isearch-process-search-multibyte-characters (isearch-last-command-char)) - (isearch-process-search-char (isearch-last-command-char)))) + (let ((char last-command-char)) + (if (= char ?\S-\ ) + (setq char ?\ )) + (if (and enable-multibyte-characters + (>= char ?\200) + (<= char ?\377)) + (if (keyboard-coding-system) + (isearch-process-search-multibyte-characters char) + (isearch-process-search-char (unibyte-char-to-multibyte char))) + (if current-input-method + (isearch-process-search-multibyte-characters char) + (isearch-process-search-char char))))) (defun isearch-whitespace-chars () "Match all whitespace chars, if in regexp mode. -If you want to search for just a space, type C-q SPC." +If you want to search for just a space, type \\[quoted-insert] SPC." (interactive) (if isearch-regexp (if (and search-whitespace-regexp (not isearch-within-brackets) @@ -1161,8 +1301,10 @@ If you want to search for just a space, type C-q SPC." (defun isearch-process-search-char (char) ;; Append the char to the search string, update the message and re-search. (isearch-process-search-string - (isearch-char-to-string char) - (isearch-text-char-description char))) + (char-to-string char) + (if (>= char ?\200) + (char-to-string char) + (isearch-text-char-description char)))) (defun isearch-process-search-string (string message) (setq isearch-string (concat isearch-string string) @@ -1214,7 +1356,8 @@ If you want to search for just a space, type C-q SPC." (isearch-ring-adjust nil)) (defun isearch-ring-advance-edit (n) - "Insert the next element of the search history into the minibuffer." + "Insert the next element of the search history into the minibuffer. +With prefix arg N, insert the Nth element." (interactive "p") (let* ((yank-pointer-name (if isearch-regexp 'regexp-search-ring-yank-pointer @@ -1229,12 +1372,13 @@ If you want to search for just a space, type C-q SPC." (mod (- (or yank-pointer 0) n) length))) - (erase-buffer) + (delete-field) (insert (nth yank-pointer ring)) (goto-char (point-max))))) (defun isearch-ring-retreat-edit (n) - "Inserts the previous element of the search history into the minibuffer." + "Insert the previous element of the search history into the minibuffer. +With prefix arg N, insert the Nth element." (interactive "p") (isearch-ring-advance-edit (- n))) @@ -1297,7 +1441,7 @@ If there is no completion possible, say so and continue searching." (setq isearch-string (buffer-string)) (if (isearch-complete1) (progn - (erase-buffer) + (delete-field) (insert isearch-string)))) @@ -1321,8 +1465,7 @@ If there is no completion possible, say so and continue searching." (defun isearch-pop-state () (setq isearch-cmds (cdr isearch-cmds)) - (isearch-top-state) - ) + (isearch-top-state)) (defun isearch-push-state () (setq isearch-cmds @@ -1372,12 +1515,11 @@ If there is no completion possible, say so and continue searching." (if isearch-regexp "regexp " "") (if nonincremental "search" "I-search") (if isearch-forward "" " backward") - (if isearch-multibyte-characters-flag - (concat " [" default-input-method-title "]: ") + (if current-input-method + (concat " [" current-input-method-title "]: ") ": ") ))) - (aset m 0 (upcase (aref m 0))) - m)) + (concat (upcase (substring m 0 1)) (substring m 1)))) (defun isearch-message-suffix (&optional c-q-hack ellipsis) @@ -1396,7 +1538,8 @@ If there is no completion possible, say so and continue searching." (setq isearch-case-fold-search (isearch-no-upper-case-p isearch-string isearch-regexp))) (condition-case lossage - (let ((inhibit-quit nil) + (let ((inhibit-point-motion-hooks search-invisible) + (inhibit-quit nil) (case-fold-search isearch-case-fold-search) (retry t)) (if isearch-regexp (setq isearch-invalid-regexp nil)) @@ -1415,7 +1558,7 @@ If there is no completion possible, say so and continue searching." isearch-string nil t)) ;; Clear RETRY unless we matched some invisible text ;; and we aren't supposed to do that. - (if (or search-invisible + (if (or (eq search-invisible t) (not isearch-success) (bobp) (eobp) (= (match-beginning 0) (match-end 0)) @@ -1440,7 +1583,7 @@ If there is no completion possible, say so and continue searching." (setq isearch-invalid-regexp "incomplete input"))) (error ;; stack overflow in regexp search. - (setq isearch-invalid-regexp (car (cdr lossage))))) + (setq isearch-invalid-regexp (format "%s" lossage)))) (if isearch-success nil @@ -1449,28 +1592,147 @@ If there is no completion possible, say so and continue searching." (ding)) (goto-char (nth 2 (car isearch-cmds))))) + +;;; Called when opening an overlay, and we are still in isearch. +(defun isearch-open-overlay-temporary (ov) + (if (not (null (overlay-get ov 'isearch-open-invisible-temporary))) + ;; Some modes would want to open the overlays temporary during + ;; isearch in their own way, they should set the + ;; `isearch-open-invisible-temporary' to a function doing this. + (funcall (overlay-get ov 'isearch-open-invisible-temporary) ov nil) + ;; Store the values for the `invisible' and `intangible' + ;; properties, and then set them to nil. This way the text hidden + ;; by this overlay becomes visible. + + ;; Do we really need to set the `intangible' property to t? Can we + ;; have the point inside an overlay with an `intangible' property? + ;; In 19.34 this does not exist so I cannot test it. + (overlay-put ov 'isearch-invisible (overlay-get ov 'invisible)) + (overlay-put ov 'isearch-intangible (overlay-get ov 'intangible)) + (overlay-put ov 'invisible nil) + (overlay-put ov 'intangible nil))) + + +;;; This is called at the end of isearch. It will open the overlays +;;; that contain the latest match. Obviously in case of a C-g the +;;; point returns to the original location which surely is not contain +;;; in any of these overlays, se we are safe in this case too. +(defun isearch-open-necessary-overlays (ov) + (let ((inside-overlay (and (> (point) (overlay-start ov)) + (< (point) (overlay-end ov)))) + ;; If this exists it means that the overlay was opened using + ;; this function, not by us tweaking the overlay properties. + (fct-temp (overlay-get ov 'isearch-open-invisible-temporary))) + (when (or inside-overlay (not fct-temp)) + ;; restore the values for the `invisible' and `intangible' + ;; properties + (overlay-put ov 'invisible (overlay-get ov 'isearch-invisible)) + (overlay-put ov 'intangible (overlay-get ov 'isearch-intangible)) + (overlay-put ov 'isearch-invisible nil) + (overlay-put ov 'isearch-intangible nil)) + (if inside-overlay + (funcall (overlay-get ov 'isearch-open-invisible) ov) + (if fct-temp + (funcall fct-temp ov t))))) + +;;; This is called when exiting isearch. It closes the temporary +;;; opened overlays, except the ones that contain the latest match. +(defun isearch-clean-overlays () + (when isearch-opened-overlays + (mapc 'isearch-open-necessary-overlays isearch-opened-overlays) + (setq isearch-opened-overlays nil))) + +;;; Verify if the current match is outside of each element of +;;; `isearch-opened-overlays', if so close that overlay. +(defun isearch-close-unecessary-overlays (begin end) + (let ((ov-list isearch-opened-overlays) + ov + inside-overlay + fct-temp) + (setq isearch-opened-overlays nil) + (while ov-list + (setq ov (car ov-list)) + (setq ov-list (cdr ov-list)) + (setq inside-overlay (or (and (> begin (overlay-start ov)) + (< begin (overlay-end ov))) + (and (> end (overlay-start ov)) + (< end (overlay-end ov))))) + ;; If this exists it means that the overlay was opened using + ;; this function, not by us tweaking the overlay properties. + (setq fct-temp (overlay-get ov 'isearch-open-invisible-temporary)) + (if inside-overlay + (setq isearch-opened-overlays (cons ov isearch-opened-overlays)) + (if fct-temp + (funcall fct-temp ov t) + (overlay-put ov 'invisible (overlay-get ov 'isearch-invisible)) + (overlay-put ov 'intangible (overlay-get ov 'isearch-intangible)) + (overlay-put ov 'isearch-invisible nil) + (overlay-put ov 'isearch-intangible nil)))))) + (defun isearch-range-invisible (beg end) - "Return t if all the bext from BEG to END is invisible." + "Return t if all the text from BEG to END is invisible." (and (/= beg end) ;; Check that invisibility runs up to END. (save-excursion (goto-char beg) - ;; If the following character is currently invisible, - ;; skip all characters with that same `invisible' property value. - ;; Do that over and over. - (while (and (< (point) end) - (let ((prop - (get-char-property (point) 'invisible))) - (if (eq buffer-invisibility-spec t) - prop - (or (memq prop buffer-invisibility-spec) - (assq prop buffer-invisibility-spec))))) - (if (get-text-property (point) 'invisible) - (goto-char (next-single-property-change (point) 'invisible - nil end)) - (goto-char (next-overlay-change (point))))) + (let ( + ;; can-be-opened keeps track if we can open some overlays. + (can-be-opened (eq search-invisible 'open)) + ;; the list of overlays that could be opened + (crt-overlays nil)) + (when (and can-be-opened isearch-hide-immediately) + (isearch-close-unecessary-overlays beg end)) + ;; If the following character is currently invisible, + ;; skip all characters with that same `invisible' property value. + ;; Do that over and over. + (while (and (< (point) end) + (let ((prop + (get-char-property (point) 'invisible))) + (if (eq buffer-invisibility-spec t) + prop + (or (memq prop buffer-invisibility-spec) + (assq prop buffer-invisibility-spec))))) + (if (get-text-property (point) 'invisible) + (progn + (goto-char (next-single-property-change (point) 'invisible + nil end)) + ;; if text is hidden by an `invisible' text property + ;; we cannot open it at all. + (setq can-be-opened nil)) + (unless (null can-be-opened) + (let ((overlays (overlays-at (point))) + ov-list + o + invis-prop) + (while overlays + (setq o (car overlays) + invis-prop (overlay-get o 'invisible)) + (if (if (eq buffer-invisibility-spec t) + invis-prop + (or (memq invis-prop buffer-invisibility-spec) + (assq invis-prop buffer-invisibility-spec))) + (if (overlay-get o 'isearch-open-invisible) + (setq ov-list (cons o ov-list)) + ;; We found one overlay that cannot be + ;; opened, that means the whole chunk + ;; cannot be opened. + (setq can-be-opened nil))) + (setq overlays (cdr overlays))) + (if can-be-opened + ;; It makes sense to append to the open + ;; overlays list only if we know that this is + ;; t. + (setq crt-overlays (append ov-list crt-overlays))))) + (goto-char (next-overlay-change (point))))) ;; See if invisibility reaches up thru END. - (>= (point) end)))) + (if (>= (point) end) + (if (and (not (null can-be-opened)) (consp crt-overlays)) + (progn + (setq isearch-opened-overlays + (append isearch-opened-overlays crt-overlays)) + (mapc 'isearch-open-overlay-temporary crt-overlays) + nil) + t)))))) ;;; Highlighting @@ -1478,17 +1740,22 @@ If there is no completion possible, say so and continue searching." (defvar isearch-overlay nil) (defun isearch-highlight (beg end) - (if (or (null search-highlight) (null window-system)) - nil - (or isearch-overlay (setq isearch-overlay (make-overlay beg end))) - (move-overlay isearch-overlay beg end (current-buffer)) - (overlay-put isearch-overlay 'face - (if (internal-find-face 'isearch nil) - 'isearch 'region)))) + (unless (or (null search-highlight) (null (display-color-p))) + (cond (isearch-overlay + ;; Overlay already exists, just move it. + (move-overlay isearch-overlay beg end (current-buffer))) + + (t + ;; Overlay doesn't exist, create it. + (setq isearch-overlay (make-overlay beg end)) + (overlay-put isearch-overlay 'face isearch) + (overlay-put isearch-overlay 'priority 1) ;higher than lazy overlays + )))) (defun isearch-dehighlight (totally) - (if isearch-overlay - (delete-overlay isearch-overlay))) + (when isearch-overlay + (delete-overlay isearch-overlay))) + ;;; General utilities @@ -1509,23 +1776,248 @@ since they have special meaning in a regexp." ;; Portability functions to support various Emacs versions. -(defun isearch-char-to-string (c) - (make-string 1 c)) - (defun isearch-text-char-description (c) - (if (and (integerp c) (or (< c ?\ ) (= c ?\^?))) - (text-char-description c) - (isearch-char-to-string c))) + (cond + ((< c ?\ ) (format "^%c" (+ c 64))) + ((= c ?\^?) "^?") + (t (char-to-string c)))) ;; General function to unread characters or events. ;; Also insert them in a keyboard macro being defined. (defun isearch-unread (&rest char-or-events) - (mapcar 'store-kbd-macro-event char-or-events) + (mapc 'store-kbd-macro-event char-or-events) (setq unread-command-events (append char-or-events unread-command-events))) -(defun isearch-last-command-char () - ;; General function to return the last command character. - last-command-char) + +;;; isearch-lazy-highlight feature +;;; by Bob Glickstein + +;;; When active, *every* match for the current search string is +;;; highlighted: the current one using the normal isearch match color +;;; and all the others using `isearch-lazy-highlight-face'. The extra +;;; highlighting makes it easier to anticipate where the cursor will +;;; land each time you press C-s or C-r to repeat a pending search. +;;; Highlighting of these additional matches happens in a deferred +;;; fashion using "idle timers," so the cycles needed do not rob +;;; isearch of its usual snappy response. + +;;; IMPLEMENTATION NOTE: This depends on some isearch internals. +;;; Specifically: +;;; - `isearch-update' is expected to be called (at least) every time +;;; the search string or window-start changes; +;;; - `isearch-string' is expected to contain the current search +;;; string as entered by the user; +;;; - the type of the current search is expected to be given by +;;; `isearch-word' and `isearch-regexp'; +;;; - the direction of the current search is expected to be given by +;;; `isearch-forward'; +;;; - the variable `isearch-invalid-regexp' is expected to be true +;;; iff `isearch-string' is an invalid regexp. + +(require 'timer) + +(defgroup isearch-lazy-highlight nil + "Lazy highlighting feature for incremental search." + :prefix "isearch-lazy-highlight-" + :version "21.1" + :group 'isearch) + +(defcustom isearch-lazy-highlight t + "*Controls the lazy-highlighting during incremental searches. +When non-nil, all text in the buffer matching the current search +string is highlighted lazily (see `isearch-lazy-highlight-initial-delay' +and `isearch-lazy-highlight-interval')." + :type 'boolean + :group 'isearch-lazy-highlight) + +(defcustom isearch-lazy-highlight-cleanup t + "*Controls whether to remove extra highlighting after a search. +If this is nil, extra highlighting can be \"manually\" removed with +\\[isearch-lazy-highlight-cleanup]." + :type 'boolean + :group 'isearch-lazy-highlight) + +(defcustom isearch-lazy-highlight-initial-delay 0 ; 0.25 + "*Seconds to wait before beginning to lazily highlight all matches." + :type 'number + :group 'isearch-lazy-highlight) + +(defcustom isearch-lazy-highlight-interval 0 ; 0.0625 + "*Seconds between lazily highlighting successive matches." + :type 'number + :group 'isearch-lazy-highlight) + +(defcustom isearch-lazy-highlight-max-at-a-time 20 + "*Maximum matches to highlight at a time (for `isearch-lazy-highlight'). +Larger values may reduce isearch's responsiveness to user input; +smaller values make matches highlight slowly. +A value of nil means highlight all matches." + :type '(choice (const :tag "All" nil) + (integer :tag "Some")) + :group 'isearch-lazy-highlight) + +(defgroup isearch-faces nil + "Lazy highlighting feature for incremental search." + :version "21.1" + :group 'isearch) +(defface isearch + '((((type tty pc) (class color)) + (:background "magenta4" :foreground "cyan1")) + (((class color) (background light)) + (:background "magenta4" :foreground "lightskyblue1")) + (((class color) (background dark)) + (:background "palevioletred2" :foreground "brown4")) + (t (:inverse-video t))) + "Face for highlighting Isearch matches." + :group 'isearch-faces) +(defvar isearch 'isearch) + +(defface isearch-lazy-highlight-face + '((((type tty pc) (class color)) + (:background "turquoise3")) + (((class color) (background light)) + (:background "paleturquoise")) + (((class color) (background dark)) + (:background "paleturquoise4")) + (t (:underline t))) + "Face for lazy highlighting of Isearch matches other than the current one." + :group 'isearch-faces) +(defvar isearch-lazy-highlight-face 'isearch-lazy-highlight-face) + +(defvar isearch-lazy-highlight-overlays nil) +(defvar isearch-lazy-highlight-wrapped nil) +(defvar isearch-lazy-highlight-start nil) +(defvar isearch-lazy-highlight-end nil) +(defvar isearch-lazy-highlight-timer nil) +(defvar isearch-lazy-highlight-last-string nil) +(defvar isearch-lazy-highlight-window nil) +(defvar isearch-lazy-highlight-window-start nil) + +(defun isearch-lazy-highlight-cleanup (&optional force) + "Stop lazy highlighting and remove extra highlighting from current buffer. +FORCE non-nil means do it whether or not `isearch-lazy-highlight-cleanup' +is nil. This function is called when exiting an incremental search if +`isearch-lazy-highlight-cleanup' is non-nil." + (interactive '(t)) + (if (or force isearch-lazy-highlight-cleanup) + (while isearch-lazy-highlight-overlays + (delete-overlay (car isearch-lazy-highlight-overlays)) + (setq isearch-lazy-highlight-overlays + (cdr isearch-lazy-highlight-overlays)))) + (when isearch-lazy-highlight-timer + (cancel-timer isearch-lazy-highlight-timer) + (setq isearch-lazy-highlight-timer nil))) + +(defun isearch-lazy-highlight-new-loop () + "Cleanup any previous `isearch-lazy-highlight' loop and begin a new one. +This happens when `isearch-update' is invoked (which can cause the +search string to change or the window to scroll)." + (when (and isearch-lazy-highlight + (sit-for 0) ;make sure (window-start) is credible + (or (not (equal isearch-string + isearch-lazy-highlight-last-string)) + (not (eq (selected-window) + isearch-lazy-highlight-window)) + (not (= (window-start) + isearch-lazy-highlight-window-start)))) + ;; something important did indeed change + (isearch-lazy-highlight-cleanup t) ;kill old loop & remove overlays + (when (not isearch-invalid-regexp) + (setq isearch-lazy-highlight-window (selected-window) + isearch-lazy-highlight-window-start (window-start) + isearch-lazy-highlight-start (point) + isearch-lazy-highlight-end (point) + isearch-lazy-highlight-last-string isearch-string + isearch-lazy-highlight-wrapped nil) + (setq isearch-lazy-highlight-timer + (run-with-idle-timer isearch-lazy-highlight-initial-delay nil + 'isearch-lazy-highlight-update))))) + +(defun isearch-lazy-highlight-search () + "Search ahead for the next or previous match, for lazy highlighting. +Attempt to do the search exactly the way the pending isearch would." + (let ((case-fold-search isearch-case-fold-search) + (choices (cond (isearch-word + '(word-search-forward . word-search-backward)) + (isearch-regexp + '(re-search-forward . re-search-backward)) + (t + '(search-forward . search-backward))))) + (funcall (if isearch-forward + (car choices) + (cdr choices)) + isearch-string + (if isearch-forward + (if isearch-lazy-highlight-wrapped + isearch-lazy-highlight-start + (window-end)) + (if isearch-lazy-highlight-wrapped + isearch-lazy-highlight-end + (window-start))) + t))) + +(defun isearch-lazy-highlight-update () + "Update highlighting of other matches for current search." + (let ((max isearch-lazy-highlight-max-at-a-time) + (looping t) + nomore) + (save-excursion + (save-match-data + (goto-char (if isearch-forward + isearch-lazy-highlight-end + isearch-lazy-highlight-start)) + (while looping + (let ((found (isearch-lazy-highlight-search))) + (when max + (setq max (1- max)) + (if (<= max 0) + (setq looping nil))) + (if found + (let ((mb (match-beginning 0)) + (me (match-end 0))) + (if (= mb me) ;zero-length match + (forward-char 1) + + ;; non-zero-length match + (let ((ov (make-overlay mb me))) + (overlay-put ov 'face isearch-lazy-highlight-face) + (overlay-put ov 'priority 0) ;lower than main overlay + (overlay-put ov 'window (selected-window)) + (push ov isearch-lazy-highlight-overlays))) + (if isearch-forward + (setq isearch-lazy-highlight-end (point)) + (setq isearch-lazy-highlight-start (point)))) + + ;; not found + (if isearch-lazy-highlight-wrapped + (setq looping nil + nomore t) + (setq isearch-lazy-highlight-wrapped t) + (if isearch-forward + (progn + (setq isearch-lazy-highlight-end (window-start)) + (goto-char (window-start))) + (setq isearch-lazy-highlight-start (window-end)) + (goto-char (window-end))))))) + (unless nomore + (setq isearch-lazy-highlight-timer + (run-at-time isearch-lazy-highlight-interval nil + 'isearch-lazy-highlight-update))))))) + +(defun isearch-resume (search regexp word forward message case-fold) + "Resume an incremental search. +SEARCH is the string or regexp searched for. +REGEXP non-nil means the resumed search was a regexp search. +WORD non-nil means resume a word search. +FORWARD non-nil means resume a forward search. +MESSAGE is the echo-area message recorded for the search resumed. +CASE-FOLD non-nil means the search was case-insensitive." + (isearch-mode forward regexp nil nil word) + (setq isearch-string search + isearch-message message + isearch-case-fold-search case-fold) + (isearch-search)) + ;;; isearch.el ends here