mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-27 07:37:33 +00:00
0352b20571
(isearch-close-unecessary-overlays): New function. (isearch-range-invisible): Use them. (search-invisible): Changed the semantics, the default value and updated the doc string. (isearch-opened-overlays): New variable. (isearch-mode): Initialize it. (isearch-switch-frame-handler): Call isearch-clean-overlays. (isearch-exit, isearch-cancel, isearch-abort): Likewise. (isearch-other-meta-char, isearch-search): Support the new meaning for search-invisible. (isearch-open-necessary-overlays, isearch-open-overlay-temporary) (isearch-clean-overlays): New functions. (isearch-range-invisible): If we are inside overlays that can be opened, open them, add them to isearch-opened-overlays and say that the range is visible.
1685 lines
60 KiB
EmacsLisp
1685 lines
60 KiB
EmacsLisp
;;; isearch.el --- incremental search minor mode.
|
||
|
||
;; Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
|
||
|
||
;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
|
||
;; Maintainer: FSF
|
||
|
||
;; This file is part of GNU Emacs.
|
||
|
||
;; GNU Emacs is free software; you can redistribute it and/or modify
|
||
;; it under the terms of the GNU General Public License as published by
|
||
;; the Free Software Foundation; either version 2, or (at your option)
|
||
;; any later version.
|
||
|
||
;; GNU Emacs is distributed in the hope that it will be useful,
|
||
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||
;; GNU General Public License for more details.
|
||
|
||
;; You should have received a copy of the GNU General Public License
|
||
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
||
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||
;; Boston, MA 02111-1307, USA.
|
||
|
||
;;; Commentary:
|
||
|
||
;; Instructions
|
||
|
||
;; 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).
|
||
|
||
;; The key bindings active within isearch-mode are defined below in
|
||
;; `isearch-mode-map' which is given bindings close to the default
|
||
;; characters of the original isearch.el. With `isearch-mode',
|
||
;; however, you can bind multi-character keys and it should be easier
|
||
;; to add new commands. One bug though: keys with meta-prefix cannot
|
||
;; 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.
|
||
|
||
;; The search ring and completion commands automatically put you in
|
||
;; the minibuffer to edit the string. This gives you a chance to
|
||
;; modify the search string before executing the search. There are
|
||
;; three commands to terminate the editing: C-s and C-r exit the
|
||
;; minibuffer and search forward and reverse respectively, while C-m
|
||
;; exits and does a nonincremental search.
|
||
|
||
;; Exiting immediately from isearch uses isearch-edit-string instead
|
||
;; of nonincremental-search, if search-nonincremental-instead is non-nil.
|
||
;; The name of this option should probably be changed if we decide to
|
||
;; keep the behavior. No point in forcing nonincremental search until
|
||
;; the last possible moment.
|
||
|
||
;; TODO
|
||
;; - Integrate the emacs 19 generalized command history.
|
||
;; - Think about incorporating query-replace.
|
||
;; - Hooks and options for failed search.
|
||
|
||
;;; Change Log:
|
||
|
||
;; Changes before those recorded in ChangeLog:
|
||
|
||
;; Revision 1.4 92/09/14 16:26:02 liberte
|
||
;; Added prefix args to isearch-forward, etc. to switch between
|
||
;; string and regular expression searching.
|
||
;; Added some support for lemacs.
|
||
;; Added general isearch-highlight option - but only for lemacs so far.
|
||
;; Added support for frame switching in emacs 19.
|
||
;; Added word search option to isearch-edit-string.
|
||
;; Renamed isearch-quit to isearch-abort.
|
||
;; Numerous changes to comments and doc strings.
|
||
;;
|
||
;; Revision 1.3 92/06/29 13:10:08 liberte
|
||
;; Moved modal isearch-mode handling into isearch-mode.
|
||
;; Got rid of buffer-local isearch variables.
|
||
;; isearch-edit-string used by ring adjustments, completion, and
|
||
;; nonincremental searching. C-s and C-r are additional exit commands.
|
||
;; Renamed all regex to regexp.
|
||
;; Got rid of found-start and found-point globals.
|
||
;; Generalized handling of upper-case chars.
|
||
|
||
;; Revision 1.2 92/05/27 11:33:57 liberte
|
||
;; Emacs version 19 has a search ring, which is supported here.
|
||
;; Other fixes found in the version 19 isearch are included here.
|
||
;;
|
||
;; Also see variables search-caps-disable-folding,
|
||
;; search-nonincremental-instead, search-whitespace-regexp, and
|
||
;; commands isearch-toggle-regexp, isearch-edit-string.
|
||
;;
|
||
;; semi-modal isearching is supported.
|
||
|
||
;; Changes for 1.1
|
||
;; 3/18/92 Fixed invalid-regexp.
|
||
;; 3/18/92 Fixed yanking in regexps.
|
||
|
||
;;; Code:
|
||
|
||
|
||
;;; Some additional options and constants.
|
||
|
||
(defgroup isearch nil
|
||
"Incremental search minor mode."
|
||
:prefix "isearch-"
|
||
:prefix "search-"
|
||
:group 'matching)
|
||
|
||
|
||
(defcustom search-exit-option t
|
||
"*Non-nil means random control characters terminate incremental search."
|
||
:type 'boolean
|
||
:group 'isearch)
|
||
|
||
(defcustom search-slow-window-lines 1
|
||
"*Number of lines in slow search display windows.
|
||
These are the short windows used during incremental search on slow terminals.
|
||
Negative means put the slow search window at the top (normally it's at bottom)
|
||
and the value is minus the number of lines."
|
||
:type 'integer
|
||
:group 'isearch)
|
||
|
||
(defcustom search-slow-speed 1200
|
||
"*Highest terminal speed at which to use \"slow\" style incremental search.
|
||
This is the style where a one-line window is created to show the line
|
||
that the search has reached."
|
||
:type 'integer
|
||
:group 'isearch)
|
||
|
||
(defcustom search-upper-case 'not-yanks
|
||
"*If non-nil, upper case chars disable case fold searching.
|
||
That is, upper and lower case chars must match exactly.
|
||
This applies no matter where the chars come from, but does not
|
||
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))
|
||
:group 'isearch)
|
||
|
||
(defcustom search-nonincremental-instead t
|
||
"*If non-nil, do a nonincremental search instead if exiting immediately.
|
||
Actually, `isearch-edit-string' is called to let you enter the search
|
||
string, and RET terminates editing and does a nonincremental search."
|
||
:type 'boolean
|
||
:group 'isearch)
|
||
|
||
(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."
|
||
:type 'regexp
|
||
:group 'isearch)
|
||
|
||
(defcustom search-highlight t
|
||
"*Non-nil means incremental search highlights the current match."
|
||
:type 'boolean
|
||
:group 'isearch)
|
||
|
||
(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" t))
|
||
:group 'isearch)
|
||
|
||
(defcustom isearch-hide-immediately t
|
||
"If t hide the previous match if needed.
|
||
This has efect iff `search-invisible' is set to `open' and it means
|
||
that if the current match is out of one of the previously shown
|
||
regions hide is right away, as opposed to hiding it at the end of
|
||
isearch."
|
||
:type 'boolean
|
||
:group 'isearch)
|
||
|
||
(defvar isearch-mode-hook nil
|
||
"Function(s) to call after starting up an incremental search.")
|
||
|
||
(defvar isearch-mode-end-hook nil
|
||
"Function(s) to call after terminating an incremental search.")
|
||
|
||
;;; Search ring.
|
||
|
||
(defvar search-ring nil
|
||
"List of search string sequences.")
|
||
(defvar regexp-search-ring nil
|
||
"List of regular expression search string sequences.")
|
||
|
||
(defcustom search-ring-max 16
|
||
"*Maximum length of search ring before oldest elements are thrown away."
|
||
:type 'integer
|
||
:group 'isearch)
|
||
(defcustom regexp-search-ring-max 16
|
||
"*Maximum length of regexp search ring before oldest elements are thrown away."
|
||
:type 'integer
|
||
:group 'isearch)
|
||
|
||
(defvar search-ring-yank-pointer nil
|
||
"Index in `search-ring' of last string reused.
|
||
nil if none yet.")
|
||
(defvar regexp-search-ring-yank-pointer nil
|
||
"Index in `regexp-search-ring' of last string reused.
|
||
nil if none yet.")
|
||
|
||
(defcustom search-ring-update nil
|
||
"*Non-nil if advancing or retreating in the search ring should cause search.
|
||
Default value, nil, means edit the string instead."
|
||
:type 'boolean
|
||
:group 'isearch)
|
||
|
||
;;; 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))
|
||
(char-table-p (nth 1 map))
|
||
(error "The initialization of isearch-mode-map must be updated"))
|
||
;; Make Latin-1, Latin-2, Latin-3 and Latin-4 characters
|
||
;; search for themselves.
|
||
(aset (nth 1 map) (make-char 'latin-iso8859-1) 'isearch-printing-char)
|
||
(aset (nth 1 map) (make-char 'latin-iso8859-2) 'isearch-printing-char)
|
||
(aset (nth 1 map) (make-char 'latin-iso8859-3) 'isearch-printing-char)
|
||
(aset (nth 1 map) (make-char 'latin-iso8859-4) 'isearch-printing-char)
|
||
;; 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)
|
||
|
||
(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 "\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)
|
||
|
||
;;; 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
|
||
"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.
|
||
|
||
(defvar isearch-forward nil) ; Searching in the forward direction.
|
||
(defvar isearch-regexp nil) ; Searching for a regexp.
|
||
(defvar isearch-word nil) ; Searching for words.
|
||
|
||
(defvar isearch-cmds nil) ; Stack of search status sets.
|
||
(defvar isearch-string "") ; The current search string.
|
||
(defvar isearch-message "") ; text-char-description version of isearch-string
|
||
|
||
(defvar isearch-success t) ; Searching is currently successful.
|
||
(defvar isearch-invalid-regexp nil) ; Regexp not well formed.
|
||
(defvar isearch-within-brackets nil) ; Regexp has unclosed [.
|
||
(defvar isearch-other-end nil) ; Start (end) of match if forward (backward).
|
||
(defvar isearch-wrapped nil) ; Searching restarted from the top (bottom).
|
||
(defvar isearch-barrier 0)
|
||
(defvar isearch-just-started nil)
|
||
|
||
; case-fold-search while searching.
|
||
; either nil, t, or 'yes. 'yes means the same as t except that mixed
|
||
; case in the search string is ignored.
|
||
(defvar isearch-case-fold-search nil)
|
||
|
||
(defvar isearch-adjusted nil)
|
||
(defvar isearch-slow-terminal-mode nil)
|
||
;;; If t, using a small window.
|
||
(defvar isearch-small-window nil)
|
||
(defvar isearch-opoint 0)
|
||
;;; The window configuration active at the beginning of the search.
|
||
(defvar isearch-window-configuration nil)
|
||
|
||
;; 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'.
|
||
(defvar isearch-op-fun nil)
|
||
|
||
;;; Is isearch-mode in a recursive edit for modal searching.
|
||
(defvar isearch-recursive-edit nil)
|
||
|
||
;;; Should isearch be terminated after doing one search?
|
||
(defvar isearch-nonincremental nil)
|
||
|
||
;; 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)
|
||
|
||
;; Minor-mode-alist changes - kind of redundant with the
|
||
;; echo area, but if isearching in multiple windows, it can be useful.
|
||
|
||
(or (assq 'isearch-mode minor-mode-alist)
|
||
(nconc minor-mode-alist
|
||
(list '(isearch-mode isearch-mode))))
|
||
|
||
(defvar isearch-mode nil) ;; Name of the minor mode, if non-nil.
|
||
(make-variable-buffer-local 'isearch-mode)
|
||
|
||
(define-key global-map "\C-s" 'isearch-forward)
|
||
(define-key esc-map "\C-s" 'isearch-forward-regexp)
|
||
(define-key global-map "\C-r" 'isearch-backward)
|
||
(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)
|
||
"\
|
||
Do incremental search forward.
|
||
With a prefix argument, do an incremental regular expression search instead.
|
||
\\<isearch-mode-map>
|
||
As you type characters, they add to the search string and are found.
|
||
The following non-printing keys are bound in `isearch-mode-map'.
|
||
|
||
Type \\[isearch-delete-char] to cancel characters from end of search string.
|
||
Type \\[isearch-exit] to exit, leaving point at location found.
|
||
Type LFD (C-j) to match end of line.
|
||
Type \\[isearch-repeat-forward] to search again forward,\
|
||
\\[isearch-repeat-backward] to search again backward.
|
||
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-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
|
||
been found successfully.
|
||
\\[isearch-abort] when search is successful aborts and moves point to\
|
||
starting point.
|
||
|
||
Also supported is a search ring of the previous 16 search strings.
|
||
Type \\[isearch-ring-advance] to search for the next item in the search ring.
|
||
Type \\[isearch-ring-retreat] to search for the previous item in the search\
|
||
ring.
|
||
Type \\[isearch-complete] to complete the search string using the search ring.
|
||
|
||
The above keys, bound in `isearch-mode-map', are often controlled by
|
||
options; do M-x apropos on search-.* to find them.
|
||
Other control and meta characters terminate the search
|
||
and are then executed normally (depending on `search-exit-option').
|
||
Likewise for function keys and mouse button events.
|
||
|
||
If this function is called non-interactively, it does not return to
|
||
the calling function until the search is done."
|
||
|
||
(interactive "P\np")
|
||
(isearch-mode t (not (null regexp-p)) nil (not no-recursive-edit)))
|
||
|
||
(defun isearch-forward-regexp (&optional not-regexp no-recursive-edit)
|
||
"\
|
||
Do incremental search forward for regular expression.
|
||
With a prefix argument, do a regular string search instead.
|
||
Like ordinary incremental search except that your input
|
||
is treated as a regexp. See \\[isearch-forward] for more info."
|
||
(interactive "P\np")
|
||
(isearch-mode t (null not-regexp) nil (not no-recursive-edit)))
|
||
|
||
(defun isearch-backward (&optional regexp-p no-recursive-edit)
|
||
"\
|
||
Do incremental search backward.
|
||
With a prefix argument, do a regular expression search instead.
|
||
See \\[isearch-forward] for more information."
|
||
(interactive "P\np")
|
||
(isearch-mode nil (not (null regexp-p)) nil (not no-recursive-edit)))
|
||
|
||
(defun isearch-backward-regexp (&optional not-regexp no-recursive-edit)
|
||
"\
|
||
Do incremental search backward for regular expression.
|
||
With a prefix argument, do a regular string search instead.
|
||
Like ordinary incremental search except that your input
|
||
is treated as a regexp. See \\[isearch-forward] for more info."
|
||
(interactive "P\np")
|
||
(isearch-mode nil (null not-regexp) nil (not no-recursive-edit)))
|
||
|
||
|
||
(defun isearch-mode-help ()
|
||
(interactive)
|
||
(describe-function 'isearch-forward)
|
||
(isearch-update))
|
||
|
||
|
||
;; isearch-mode only sets up incremental search for the minor mode.
|
||
;; All the work is done by the isearch-mode commands.
|
||
|
||
;; Not used yet:
|
||
;;(defvar isearch-commands '(isearch-forward isearch-backward
|
||
;; isearch-forward-regexp isearch-backward-regexp)
|
||
;; "List of commands for which isearch-mode does not recursive-edit.")
|
||
|
||
|
||
(defun isearch-mode (forward &optional regexp op-fun recursive-edit word-p)
|
||
"Start isearch minor mode. Called by `isearch-forward', etc.
|
||
|
||
\\{isearch-mode-map}"
|
||
|
||
;; Initialize global vars.
|
||
(setq isearch-forward forward
|
||
isearch-regexp regexp
|
||
isearch-word word-p
|
||
isearch-op-fun op-fun
|
||
isearch-case-fold-search case-fold-search
|
||
isearch-string ""
|
||
isearch-message ""
|
||
isearch-cmds nil
|
||
isearch-success t
|
||
isearch-wrapped nil
|
||
isearch-barrier (point)
|
||
isearch-adjusted nil
|
||
isearch-yank-flag nil
|
||
isearch-invalid-regexp nil
|
||
isearch-within-brackets nil
|
||
isearch-slow-terminal-mode (and (<= baud-rate search-slow-speed)
|
||
(> (window-height)
|
||
(* 4 search-slow-window-lines)))
|
||
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
|
||
isearch-opened-overlays nil
|
||
regexp-search-ring-yank-pointer nil)
|
||
(looking-at "")
|
||
(setq isearch-window-configuration
|
||
(if isearch-slow-terminal-mode (current-window-configuration) nil))
|
||
|
||
;; Maybe make minibuffer frame visible and/or raise it.
|
||
(let ((frame (window-frame (minibuffer-window))))
|
||
(if (not (memq (frame-live-p frame) '(nil t)))
|
||
(progn
|
||
(make-frame-visible frame)
|
||
(if minibuffer-auto-raise
|
||
(raise-frame frame)))))
|
||
|
||
(setq isearch-mode " Isearch") ;; forward? regexp?
|
||
(force-mode-line-update)
|
||
|
||
(isearch-push-state)
|
||
|
||
(setq overriding-terminal-local-map isearch-mode-map)
|
||
(isearch-update)
|
||
(run-hooks 'isearch-mode-hook)
|
||
|
||
(add-hook 'mouse-leave-buffer-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
|
||
;; a recursive-edit and exiting it when done isearching.
|
||
(if recursive-edit
|
||
(let ((isearch-recursive-edit t))
|
||
(recursive-edit)))
|
||
isearch-success)
|
||
|
||
|
||
;; Some high level utilities. Others below.
|
||
|
||
(defun isearch-update ()
|
||
;; 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))
|
||
))
|
||
(setq ;; quit-flag nil not for isearch-mode
|
||
isearch-adjusted nil
|
||
isearch-yank-flag nil)
|
||
)
|
||
|
||
(defun isearch-done (&optional nopush edit)
|
||
(remove-hook 'mouse-leave-buffer-hook 'isearch-done)
|
||
;; 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
|
||
(isearch-dehighlight t)
|
||
(let ((found-start (window-start (selected-window)))
|
||
(found-point (point)))
|
||
(if isearch-window-configuration
|
||
(set-window-configuration isearch-window-configuration))
|
||
|
||
(if isearch-small-window
|
||
(goto-char found-point)
|
||
;; Exiting the save-window-excursion clobbers window-start; restore it.
|
||
(set-window-start (selected-window) found-start t))
|
||
|
||
;; If there was movement, mark the starting position.
|
||
;; Maybe should test difference between and set mark iff > threshold.
|
||
(if (/= (point) isearch-opoint)
|
||
(or (and transient-mark-mode mark-active)
|
||
(progn
|
||
(push-mark isearch-opoint t)
|
||
(or executing-kbd-macro (> (minibuffer-depth) 0)
|
||
(message "Mark saved where search started"))))))
|
||
|
||
(setq isearch-mode nil)
|
||
(force-mode-line-update)
|
||
|
||
(if (and (> (length isearch-string) 0) (not nopush))
|
||
;; Update the ring data.
|
||
(isearch-update-ring isearch-string isearch-regexp))
|
||
|
||
(run-hooks 'isearch-mode-end-hook)
|
||
(and (not edit) isearch-recursive-edit (exit-recursive-edit)))
|
||
|
||
(defun isearch-update-ring (string &optional regexp)
|
||
"Add STRING to the beginning of the search ring.
|
||
REGEXP says which ring to use."
|
||
(if regexp
|
||
(if (or (null regexp-search-ring)
|
||
(not (string= string (car regexp-search-ring))))
|
||
(progn
|
||
(setq regexp-search-ring
|
||
(cons string regexp-search-ring))
|
||
(if (> (length regexp-search-ring) regexp-search-ring-max)
|
||
(setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
|
||
nil))))
|
||
(if (or (null search-ring)
|
||
(not (string= string (car search-ring))))
|
||
(progn
|
||
(setq search-ring (cons string search-ring))
|
||
(if (> (length search-ring) search-ring-max)
|
||
(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)
|
||
(isearch-clean-overlays)
|
||
(handle-switch-frame (car (cdr (isearch-last-command-char)))))
|
||
|
||
|
||
;; Commands active while inside of the isearch minor mode.
|
||
|
||
(defun isearch-exit ()
|
||
"Exit search normally.
|
||
However, if this is the first command after starting incremental
|
||
search and `search-nonincremental-instead' is non-nil, do a
|
||
nonincremental search instead via `isearch-edit-string'."
|
||
(interactive)
|
||
(if (and search-nonincremental-instead
|
||
(= 0 (length isearch-string)))
|
||
(let ((isearch-nonincremental t))
|
||
(isearch-edit-string)))
|
||
(isearch-done)
|
||
(isearch-clean-overlays))
|
||
|
||
|
||
(defun isearch-edit-string ()
|
||
"Edit the search string in the minibuffer.
|
||
The following additional command keys are active while editing.
|
||
\\<minibuffer-local-isearch-map>
|
||
\\[exit-minibuffer] to resume incremental searching with the edited string.
|
||
\\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search.
|
||
\\[isearch-forward-exit-minibuffer] to resume isearching forward.
|
||
\\[isearch-reverse-exit-minibuffer] to resume isearching backward.
|
||
\\[isearch-ring-advance-edit] to replace the search string with the next item in the search ring.
|
||
\\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring.
|
||
\\[isearch-complete-edit] to complete the search string using the search ring.
|
||
\\<isearch-mode-map>
|
||
If first char entered is \\[isearch-yank-word], then do word search instead."
|
||
|
||
;; This code is very hairy for several reasons, explained in the code.
|
||
;; Mainly, isearch-mode must be terminated while editing and then restarted.
|
||
;; If there were a way to catch any change of buffer from the minibuffer,
|
||
;; this could be simplified greatly.
|
||
;; Editing doesn't back up the search point. Should it?
|
||
(interactive)
|
||
(condition-case err
|
||
(progn
|
||
(let ((isearch-nonincremental isearch-nonincremental)
|
||
|
||
;; Locally bind all isearch global variables to protect them
|
||
;; from recursive isearching.
|
||
;; isearch-string -message and -forward are not bound
|
||
;; so they may be changed. Instead, save the values.
|
||
(isearch-new-string isearch-string)
|
||
(isearch-new-message isearch-message)
|
||
(isearch-new-forward isearch-forward)
|
||
(isearch-new-word isearch-word)
|
||
|
||
(isearch-regexp isearch-regexp)
|
||
(isearch-op-fun isearch-op-fun)
|
||
(isearch-cmds isearch-cmds)
|
||
(isearch-success isearch-success)
|
||
(isearch-wrapped isearch-wrapped)
|
||
(isearch-barrier isearch-barrier)
|
||
(isearch-adjusted isearch-adjusted)
|
||
(isearch-yank-flag isearch-yank-flag)
|
||
(isearch-invalid-regexp isearch-invalid-regexp)
|
||
(isearch-within-brackets isearch-within-brackets)
|
||
;;; Don't bind this. We want isearch-search, below, to set it.
|
||
;;; And the old value won't matter after that.
|
||
;;; (isearch-other-end isearch-other-end)
|
||
;;; Perhaps some of these other variables should be bound for a
|
||
;;; shorter period, ending before the next isearch-search.
|
||
;;; But there doesn't seem to be a real bug, so let's not risk it now.
|
||
(isearch-opoint isearch-opoint)
|
||
(isearch-slow-terminal-mode isearch-slow-terminal-mode)
|
||
(isearch-small-window isearch-small-window)
|
||
(isearch-recursive-edit isearch-recursive-edit)
|
||
;; Save current configuration so we can restore it here.
|
||
(isearch-window-configuration (current-window-configuration))
|
||
)
|
||
|
||
;; Actually terminate isearching until editing is done.
|
||
;; This is so that the user can do anything without failure,
|
||
;; like switch buffers and start another isearch, and return.
|
||
(condition-case err
|
||
(isearch-done t t)
|
||
(exit nil)) ; was recursive editing
|
||
|
||
(isearch-message) ;; for read-char
|
||
(unwind-protect
|
||
(let* (;; Why does following read-char echo?
|
||
;;(echo-keystrokes 0) ;; not needed with above message
|
||
(e (let ((cursor-in-echo-area t))
|
||
(read-event)))
|
||
;; Binding minibuffer-history-symbol to nil is a work-around
|
||
;; for some incompatibility with gmhist.
|
||
(minibuffer-history-symbol)
|
||
(message-log-max nil))
|
||
;; If the first character the user types when we prompt them
|
||
;; for a string is the yank-word character, then go into
|
||
;; word-search mode. Otherwise unread that character and
|
||
;; read a key the normal way.
|
||
;; Word search does not apply (yet) to regexp searches,
|
||
;; no check is made here.
|
||
(message (isearch-message-prefix nil nil t))
|
||
(if (eq 'isearch-yank-word
|
||
(lookup-key isearch-mode-map (vector e)))
|
||
(setq isearch-word t;; so message-prefix is right
|
||
isearch-new-word t)
|
||
(cancel-kbd-macro-events)
|
||
(isearch-unread e))
|
||
(setq cursor-in-echo-area nil)
|
||
(setq isearch-new-string
|
||
(let (junk-ring)
|
||
(read-from-minibuffer
|
||
(isearch-message-prefix nil nil isearch-nonincremental)
|
||
isearch-string
|
||
minibuffer-local-isearch-map nil
|
||
'junk-ring))
|
||
isearch-new-message
|
||
(mapconcat 'isearch-text-char-description
|
||
isearch-new-string "")))
|
||
;; Always resume isearching by restarting it.
|
||
(isearch-mode isearch-forward
|
||
isearch-regexp
|
||
isearch-op-fun
|
||
nil
|
||
isearch-word)
|
||
|
||
;; Copy new local values to isearch globals
|
||
(setq isearch-string isearch-new-string
|
||
isearch-message isearch-new-message
|
||
isearch-forward isearch-new-forward
|
||
isearch-word isearch-new-word))
|
||
|
||
;; Empty isearch-string means use default.
|
||
(if (= 0 (length isearch-string))
|
||
(setq isearch-string (or (car (if isearch-regexp
|
||
regexp-search-ring
|
||
search-ring))
|
||
""))
|
||
;; This used to set the last search string,
|
||
;; but I think it is not right to do that here.
|
||
;; Only the string actually used should be saved.
|
||
))
|
||
|
||
;; Push the state as of before this C-s.
|
||
(isearch-push-state)
|
||
|
||
;; Reinvoke the pending search.
|
||
(isearch-search)
|
||
(isearch-update)
|
||
(if isearch-nonincremental
|
||
(progn
|
||
;; (sit-for 1) ;; needed if isearch-done does: (message "")
|
||
(isearch-done))))
|
||
|
||
(quit ; handle abort-recursive-edit
|
||
(isearch-abort) ;; outside of let to restore outside global values
|
||
)))
|
||
|
||
(defun isearch-nonincremental-exit-minibuffer ()
|
||
(interactive)
|
||
(setq isearch-nonincremental t)
|
||
(exit-minibuffer))
|
||
|
||
(defun isearch-forward-exit-minibuffer ()
|
||
(interactive)
|
||
(setq isearch-new-forward t)
|
||
(exit-minibuffer))
|
||
|
||
(defun isearch-reverse-exit-minibuffer ()
|
||
(interactive)
|
||
(setq isearch-new-forward nil)
|
||
(exit-minibuffer))
|
||
|
||
(defun isearch-cancel ()
|
||
"Terminate the search and go back to the starting point."
|
||
(interactive)
|
||
(goto-char isearch-opoint)
|
||
(isearch-done t)
|
||
(isearch-clean-overlays)
|
||
(signal 'quit nil)) ; and pass on quit signal
|
||
|
||
(defun isearch-abort ()
|
||
"Abort incremental search mode if searching is successful, signaling quit.
|
||
Otherwise, revert to previous successful search and continue searching.
|
||
Use `isearch-exit' to quit without signaling."
|
||
(interactive)
|
||
;; (ding) signal instead below, if quitting
|
||
(discard-input)
|
||
(if isearch-success
|
||
;; If search is successful, move back to starting point
|
||
;; and really do quit.
|
||
(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.
|
||
(while (or (not isearch-success) isearch-invalid-regexp)
|
||
(isearch-pop-state))
|
||
(isearch-update)))
|
||
|
||
(defun isearch-repeat (direction)
|
||
;; Utility for isearch-repeat-forward and -backward.
|
||
(if (eq isearch-forward (eq direction 'forward))
|
||
;; C-s in forward or C-r in reverse.
|
||
(if (equal isearch-string "")
|
||
;; If search string is empty, use last one.
|
||
(setq isearch-string
|
||
(or (if isearch-regexp
|
||
(car regexp-search-ring)
|
||
(car search-ring))
|
||
"")
|
||
isearch-message
|
||
(mapconcat 'isearch-text-char-description
|
||
isearch-string ""))
|
||
;; If already have what to search for, repeat it.
|
||
(or isearch-success
|
||
(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.
|
||
(setq isearch-forward (not isearch-forward)))
|
||
|
||
(setq isearch-barrier (point)) ; For subsequent \| if regexp.
|
||
|
||
(if (equal isearch-string "")
|
||
(setq isearch-success t)
|
||
(if (and isearch-success (equal (match-end 0) (match-beginning 0))
|
||
(not isearch-just-started))
|
||
;; If repeating a search that found
|
||
;; an empty string, ensure we advance.
|
||
(if (if isearch-forward (eobp) (bobp))
|
||
;; If there's nowhere to advance to, fail (and wrap next time).
|
||
(progn
|
||
(setq isearch-success nil)
|
||
(ding))
|
||
(forward-char (if isearch-forward 1 -1))
|
||
(isearch-search))
|
||
(isearch-search)))
|
||
|
||
(isearch-push-state)
|
||
(isearch-update))
|
||
|
||
(defun isearch-repeat-forward ()
|
||
"Repeat incremental search forwards."
|
||
(interactive)
|
||
(isearch-repeat 'forward))
|
||
|
||
(defun isearch-repeat-backward ()
|
||
"Repeat incremental search backwards."
|
||
(interactive)
|
||
(isearch-repeat 'backward))
|
||
|
||
(defun isearch-toggle-regexp ()
|
||
"Toggle regexp searching on or off."
|
||
;; The status stack is left unchanged.
|
||
(interactive)
|
||
(setq isearch-regexp (not isearch-regexp))
|
||
(if isearch-regexp (setq isearch-word nil))
|
||
(isearch-update))
|
||
|
||
(defun isearch-toggle-case-fold ()
|
||
"Toggle case folding in searching on or off."
|
||
(interactive)
|
||
(setq isearch-case-fold-search
|
||
(if isearch-case-fold-search nil 'yes))
|
||
(let ((message-log-max nil))
|
||
(message "%s%s [case %ssensitive]"
|
||
(isearch-message-prefix nil nil isearch-nonincremental)
|
||
isearch-message
|
||
(if isearch-case-fold-search "in" "")))
|
||
(setq isearch-adjusted t)
|
||
(sit-for 1)
|
||
(isearch-update))
|
||
|
||
(defun isearch-delete-char ()
|
||
"Discard last input item and move point back.
|
||
If no previous match was done, just beep."
|
||
(interactive)
|
||
(if (null (cdr isearch-cmds))
|
||
(ding)
|
||
(isearch-pop-state))
|
||
(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))
|
||
(isearch-search-and-update))
|
||
|
||
(defun isearch-yank-kill ()
|
||
"Pull string from kill ring into search string."
|
||
(interactive)
|
||
(isearch-yank 'kill))
|
||
|
||
(defun isearch-yank-word ()
|
||
"Pull next word from buffer into search string."
|
||
(interactive)
|
||
(isearch-yank 'word))
|
||
|
||
(defun isearch-yank-line ()
|
||
"Pull rest of line from buffer into search string."
|
||
(interactive)
|
||
(isearch-yank 'line))
|
||
|
||
|
||
(defun isearch-search-and-update ()
|
||
;; Do the search and update the display.
|
||
(if (and (not isearch-success)
|
||
;; unsuccessful regexp search may become
|
||
;; successful by addition of characters which
|
||
;; make isearch-string valid
|
||
(not isearch-regexp))
|
||
nil
|
||
;; In reverse search, adding stuff at
|
||
;; the end may cause zero or many more chars to be
|
||
;; matched, in the string following point.
|
||
;; Allow all those possibilities without moving point as
|
||
;; long as the match does not extend past search origin.
|
||
(if (and (not isearch-forward) (not isearch-adjusted)
|
||
(condition-case ()
|
||
(let ((case-fold-search isearch-case-fold-search))
|
||
(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))
|
||
;; 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
|
||
(min isearch-opoint
|
||
isearch-barrier
|
||
(1+ isearch-other-end)))))
|
||
(isearch-search)
|
||
))
|
||
(isearch-push-state)
|
||
(if isearch-op-fun (funcall isearch-op-fun))
|
||
(isearch-update))
|
||
|
||
|
||
;; *, ?, and | chars can make a regexp more liberal.
|
||
;; They can make a regexp match sooner or make it succeed instead of failing.
|
||
;; So go back to place last successful search started
|
||
;; or to the last ^S/^R (barrier), whichever is nearer.
|
||
;; + needs no special handling because the string must match at least once.
|
||
|
||
(defun isearch-*-char ()
|
||
"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)))
|
||
|
||
|
||
(defun isearch-|-char ()
|
||
"If in regexp search, jump to the barrier."
|
||
(interactive)
|
||
(if isearch-regexp
|
||
(progn
|
||
(setq isearch-adjusted t)
|
||
(goto-char isearch-barrier)))
|
||
(isearch-process-search-char (isearch-last-command-char)))
|
||
|
||
|
||
(defalias 'isearch-other-control-char 'isearch-other-meta-char)
|
||
|
||
(defun isearch-other-meta-char ()
|
||
"Exit the search normally and reread this key sequence.
|
||
But only if `search-exit-option' is non-nil, the default.
|
||
If it is the symbol `edit', the search string is edited in the minibuffer
|
||
and the meta character is unread so that it applies to editing the string."
|
||
(interactive)
|
||
(let* ((key (this-command-keys))
|
||
(main-event (aref key 0))
|
||
(keylist (listify-key-sequence key)))
|
||
(cond ((and (= (length key) 1)
|
||
(let ((lookup (lookup-key function-key-map key)))
|
||
(not (or (null lookup) (integerp lookup)
|
||
(keymapp lookup)))))
|
||
;; Handle a function key that translates into something else.
|
||
;; If the key has a global definition too,
|
||
;; exit and unread the key itself, so its global definition runs.
|
||
;; Otherwise, unread the translation,
|
||
;; so that the translated key takes effect within isearch.
|
||
(cancel-kbd-macro-events)
|
||
(if (lookup-key global-map key)
|
||
(progn
|
||
(isearch-done)
|
||
(apply 'isearch-unread keylist))
|
||
(apply 'isearch-unread
|
||
(listify-key-sequence (lookup-key function-key-map key)))))
|
||
(
|
||
;; Handle an undefined shifted control character
|
||
;; by downshifting it if that makes it defined.
|
||
;; (As read-key-sequence would normally do,
|
||
;; if we didn't have a default definition.)
|
||
(let ((mods (event-modifiers main-event)))
|
||
(and (integerp main-event)
|
||
(memq 'shift mods)
|
||
(memq 'control mods)
|
||
(lookup-key isearch-mode-map
|
||
(let ((copy (copy-sequence key)))
|
||
(aset copy 0
|
||
(- main-event (- ?\C-\S-a ?\C-a)))
|
||
copy)
|
||
nil)))
|
||
(setcar keylist (- main-event (- ?\C-\S-a ?\C-a)))
|
||
(cancel-kbd-macro-events)
|
||
(apply 'isearch-unread keylist))
|
||
((eq search-exit-option 'edit)
|
||
(apply 'isearch-unread keylist)
|
||
(isearch-edit-string))
|
||
(search-exit-option
|
||
(let (window)
|
||
(cancel-kbd-macro-events)
|
||
(apply 'isearch-unread keylist)
|
||
;; Properly handle scroll-bar and mode-line clicks
|
||
;; for which a dummy prefix event was generated as (aref key 0).
|
||
(and (> (length key) 1)
|
||
(symbolp (aref key 0))
|
||
(listp (aref key 1))
|
||
(not (numberp (posn-point (event-start (aref key 1)))))
|
||
;; Convert the event back into its raw form,
|
||
;; with the dummy prefix implicit in the mouse event,
|
||
;; so it will get split up once again.
|
||
(progn (setq unread-command-events
|
||
(cdr unread-command-events))
|
||
(setq main-event (car unread-command-events))
|
||
(setcar (cdr (event-start main-event))
|
||
(car (nth 1 (event-start main-event))))))
|
||
;; If we got a mouse click, maybe it was read with the buffer
|
||
;; it was clicked on. If so, that buffer, not the current one,
|
||
;; 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))
|
||
(save-excursion
|
||
(set-buffer (window-buffer window))
|
||
(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))))
|
||
|
||
(defun isearch-return-char ()
|
||
"Convert return into newline for incremental search.
|
||
Obsolete."
|
||
(interactive)
|
||
(isearch-process-search-char ?\n))
|
||
|
||
(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))))
|
||
|
||
(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."
|
||
(interactive)
|
||
(if isearch-regexp
|
||
(if (and search-whitespace-regexp (not isearch-within-brackets)
|
||
(not isearch-invalid-regexp))
|
||
(isearch-process-search-string search-whitespace-regexp " ")
|
||
(isearch-printing-char))
|
||
(progn
|
||
;; This way of doing word search doesn't correctly extend current search.
|
||
;; (setq isearch-word t)
|
||
;; (setq isearch-adjusted t)
|
||
;; (goto-char isearch-barrier)
|
||
(isearch-printing-char))))
|
||
|
||
(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)
|
||
(if (>= char 0200)
|
||
(char-to-string char)
|
||
(isearch-text-char-description char))))
|
||
|
||
(defun isearch-process-search-string (string message)
|
||
(setq isearch-string (concat isearch-string string)
|
||
isearch-message (concat isearch-message message))
|
||
(isearch-search-and-update))
|
||
|
||
|
||
;; Search Ring
|
||
|
||
(defun isearch-ring-adjust1 (advance)
|
||
;; Helper for isearch-ring-adjust
|
||
(let* ((ring (if isearch-regexp regexp-search-ring search-ring))
|
||
(length (length ring))
|
||
(yank-pointer-name (if isearch-regexp
|
||
'regexp-search-ring-yank-pointer
|
||
'search-ring-yank-pointer))
|
||
(yank-pointer (eval yank-pointer-name)))
|
||
(if (zerop length)
|
||
()
|
||
(set yank-pointer-name
|
||
(setq yank-pointer
|
||
(mod (+ (or yank-pointer 0)
|
||
(if advance -1 1))
|
||
length)))
|
||
(setq isearch-string (nth yank-pointer ring)
|
||
isearch-message (mapconcat 'isearch-text-char-description
|
||
isearch-string "")))))
|
||
|
||
(defun isearch-ring-adjust (advance)
|
||
;; Helper for isearch-ring-advance and isearch-ring-retreat
|
||
(isearch-ring-adjust1 advance)
|
||
(if search-ring-update
|
||
(progn
|
||
(isearch-search)
|
||
(isearch-update))
|
||
(isearch-edit-string)
|
||
)
|
||
(isearch-push-state))
|
||
|
||
(defun isearch-ring-advance ()
|
||
"Advance to the next search string in the ring."
|
||
;; This could be more general to handle a prefix arg, but who would use it.
|
||
(interactive)
|
||
(isearch-ring-adjust 'advance))
|
||
|
||
(defun isearch-ring-retreat ()
|
||
"Retreat to the previous search string in the ring."
|
||
(interactive)
|
||
(isearch-ring-adjust nil))
|
||
|
||
(defun isearch-ring-advance-edit (n)
|
||
"Insert the next element of the search history into the minibuffer."
|
||
(interactive "p")
|
||
(let* ((yank-pointer-name (if isearch-regexp
|
||
'regexp-search-ring-yank-pointer
|
||
'search-ring-yank-pointer))
|
||
(yank-pointer (eval yank-pointer-name))
|
||
(ring (if isearch-regexp regexp-search-ring search-ring))
|
||
(length (length ring)))
|
||
(if (zerop length)
|
||
()
|
||
(set yank-pointer-name
|
||
(setq yank-pointer
|
||
(mod (- (or yank-pointer 0) n)
|
||
length)))
|
||
|
||
(erase-buffer)
|
||
(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."
|
||
(interactive "p")
|
||
(isearch-ring-advance-edit (- n)))
|
||
|
||
;;(defun isearch-ring-adjust-edit (advance)
|
||
;; "Use the next or previous search string in the ring while in minibuffer."
|
||
;; (isearch-ring-adjust1 advance)
|
||
;; (erase-buffer)
|
||
;; (insert isearch-string))
|
||
|
||
;;(defun isearch-ring-advance-edit ()
|
||
;; (interactive)
|
||
;; (isearch-ring-adjust-edit 'advance))
|
||
|
||
;;(defun isearch-ring-retreat-edit ()
|
||
;; "Retreat to the previous search string in the ring while in the minibuffer."
|
||
;; (interactive)
|
||
;; (isearch-ring-adjust-edit nil))
|
||
|
||
|
||
(defun isearch-complete1 ()
|
||
;; Helper for isearch-complete and isearch-complete-edit
|
||
;; Return t if completion OK, nil if no completion exists.
|
||
(let* ((ring (if isearch-regexp regexp-search-ring search-ring))
|
||
(alist (mapcar (function (lambda (string) (list string))) ring))
|
||
(completion-ignore-case case-fold-search)
|
||
(completion (try-completion isearch-string alist)))
|
||
(cond
|
||
((eq completion t)
|
||
;; isearch-string stays the same
|
||
t)
|
||
((or completion ; not nil, must be a string
|
||
(= 0 (length isearch-string))) ; shouldn't have to say this
|
||
(if (equal completion isearch-string) ;; no extension?
|
||
(progn
|
||
(if completion-auto-help
|
||
(with-output-to-temp-buffer "*Isearch completions*"
|
||
(display-completion-list
|
||
(all-completions isearch-string alist))))
|
||
t)
|
||
(and completion
|
||
(setq isearch-string completion))))
|
||
(t
|
||
(message "No completion") ; waits a second if in minibuffer
|
||
nil))))
|
||
|
||
(defun isearch-complete ()
|
||
"Complete the search string from the strings on the search ring.
|
||
The completed string is then editable in the minibuffer.
|
||
If there is no completion possible, say so and continue searching."
|
||
(interactive)
|
||
(if (isearch-complete1)
|
||
(isearch-edit-string)
|
||
;; else
|
||
(sit-for 1)
|
||
(isearch-update)))
|
||
|
||
(defun isearch-complete-edit ()
|
||
"Same as `isearch-complete' except in the minibuffer."
|
||
(interactive)
|
||
(setq isearch-string (buffer-string))
|
||
(if (isearch-complete1)
|
||
(progn
|
||
(erase-buffer)
|
||
(insert isearch-string))))
|
||
|
||
|
||
;; The search status stack (and isearch window-local variables, not used).
|
||
;; Need a structure for this.
|
||
|
||
(defun isearch-top-state ()
|
||
(let ((cmd (car isearch-cmds)))
|
||
(setq isearch-string (car cmd)
|
||
isearch-message (car (cdr cmd))
|
||
isearch-success (nth 3 cmd)
|
||
isearch-forward (nth 4 cmd)
|
||
isearch-other-end (nth 5 cmd)
|
||
isearch-word (nth 6 cmd)
|
||
isearch-invalid-regexp (nth 7 cmd)
|
||
isearch-wrapped (nth 8 cmd)
|
||
isearch-barrier (nth 9 cmd)
|
||
isearch-within-brackets (nth 10 cmd)
|
||
isearch-case-fold-search (nth 11 cmd))
|
||
(goto-char (car (cdr (cdr cmd))))))
|
||
|
||
(defun isearch-pop-state ()
|
||
(setq isearch-cmds (cdr isearch-cmds))
|
||
(isearch-top-state)
|
||
)
|
||
|
||
(defun isearch-push-state ()
|
||
(setq isearch-cmds
|
||
(cons (list isearch-string isearch-message (point)
|
||
isearch-success isearch-forward isearch-other-end
|
||
isearch-word
|
||
isearch-invalid-regexp isearch-wrapped isearch-barrier
|
||
isearch-within-brackets isearch-case-fold-search)
|
||
isearch-cmds)))
|
||
|
||
|
||
;; Message string
|
||
|
||
(defun isearch-message (&optional c-q-hack ellipsis)
|
||
;; Generate and print the message string.
|
||
(let ((cursor-in-echo-area ellipsis)
|
||
(m (concat
|
||
(isearch-message-prefix c-q-hack ellipsis isearch-nonincremental)
|
||
isearch-message
|
||
(isearch-message-suffix c-q-hack ellipsis)
|
||
)))
|
||
(if c-q-hack
|
||
m
|
||
(let ((message-log-max nil))
|
||
(message "%s" m)))))
|
||
|
||
(defun isearch-message-prefix (&optional c-q-hack ellipsis nonincremental)
|
||
;; If about to search, and previous search regexp was invalid,
|
||
;; check that it still is. If it is valid now,
|
||
;; let the message we display while searching say that it is valid.
|
||
(and isearch-invalid-regexp ellipsis
|
||
(condition-case ()
|
||
(progn (re-search-forward isearch-string (point) t)
|
||
(setq isearch-invalid-regexp nil
|
||
isearch-within-brackets nil))
|
||
(error nil)))
|
||
;; If currently failing, display no ellipsis.
|
||
(or isearch-success (setq ellipsis nil))
|
||
(let ((m (concat (if isearch-success "" "failing ")
|
||
(if (and isearch-wrapped
|
||
(if isearch-forward
|
||
(> (point) isearch-opoint)
|
||
(< (point) isearch-opoint)))
|
||
"over")
|
||
(if isearch-wrapped "wrapped ")
|
||
(if isearch-word "word " "")
|
||
(if isearch-regexp "regexp " "")
|
||
(if nonincremental "search" "I-search")
|
||
(if isearch-forward "" " backward")
|
||
(if isearch-multibyte-characters-flag
|
||
(concat " [" default-input-method-title "]: ")
|
||
": ")
|
||
)))
|
||
(aset m 0 (upcase (aref m 0)))
|
||
m))
|
||
|
||
|
||
(defun isearch-message-suffix (&optional c-q-hack ellipsis)
|
||
(concat (if c-q-hack "^Q" "")
|
||
(if isearch-invalid-regexp
|
||
(concat " [" isearch-invalid-regexp "]")
|
||
"")))
|
||
|
||
|
||
;;; Searching
|
||
|
||
(defun isearch-search ()
|
||
;; Do the search with the current search string.
|
||
(isearch-message nil t)
|
||
(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)))
|
||
(condition-case lossage
|
||
(let ((inhibit-quit nil)
|
||
(case-fold-search isearch-case-fold-search)
|
||
(retry t))
|
||
(if isearch-regexp (setq isearch-invalid-regexp nil))
|
||
(setq isearch-within-brackets nil)
|
||
(while retry
|
||
(setq isearch-success
|
||
(funcall
|
||
(cond (isearch-word
|
||
(if isearch-forward
|
||
'word-search-forward 'word-search-backward))
|
||
(isearch-regexp
|
||
(if isearch-forward
|
||
're-search-forward 're-search-backward))
|
||
(t
|
||
(if isearch-forward 'search-forward 'search-backward)))
|
||
isearch-string nil t))
|
||
;; Clear RETRY unless we matched some invisible text
|
||
;; and we aren't supposed to do that.
|
||
(if (or (eq search-invisible t)
|
||
(not isearch-success)
|
||
(bobp) (eobp)
|
||
(= (match-beginning 0) (match-end 0))
|
||
(not (isearch-range-invisible
|
||
(match-beginning 0) (match-end 0))))
|
||
(setq retry nil)))
|
||
(setq isearch-just-started nil)
|
||
(if isearch-success
|
||
(setq isearch-other-end
|
||
(if isearch-forward (match-beginning 0) (match-end 0)))))
|
||
|
||
(quit (isearch-unread ?\C-g)
|
||
(setq isearch-success nil))
|
||
|
||
(invalid-regexp
|
||
(setq isearch-invalid-regexp (car (cdr lossage)))
|
||
(setq isearch-within-brackets (string-match "\\`Unmatched \\["
|
||
isearch-invalid-regexp))
|
||
(if (string-match
|
||
"\\`Premature \\|\\`Unmatched \\|\\`Invalid "
|
||
isearch-invalid-regexp)
|
||
(setq isearch-invalid-regexp "incomplete input")))
|
||
(error
|
||
;; stack overflow in regexp search.
|
||
(setq isearch-invalid-regexp (car (cdr lossage)))))
|
||
|
||
(if isearch-success
|
||
nil
|
||
;; Ding if failed this time after succeeding last time.
|
||
(and (nth 3 (car isearch-cmds))
|
||
(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)
|
||
(message "temporary called")
|
||
(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 realy 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. I 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
|
||
;; Use a cycle instead of a mapcar here?
|
||
(mapcar
|
||
(function 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."
|
||
(and (/= beg end)
|
||
;; Check that invisibility runs up to END.
|
||
(save-excursion
|
||
(goto-char beg)
|
||
(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 (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.
|
||
(if (>= (point) end)
|
||
(if (and (not (null can-be-opened)) (consp crt-overlays))
|
||
(progn
|
||
(setq isearch-opened-overlays
|
||
(append isearch-opened-overlays crt-overlays))
|
||
;; maybe use a cycle instead of mapcar?
|
||
(mapcar (function isearch-open-overlay-temporary)
|
||
crt-overlays)
|
||
nil)
|
||
t))))))
|
||
|
||
|
||
;;; Highlighting
|
||
|
||
(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))))
|
||
|
||
(defun isearch-dehighlight (totally)
|
||
(if isearch-overlay
|
||
(delete-overlay isearch-overlay)))
|
||
|
||
;;; General utilities
|
||
|
||
|
||
(defun isearch-no-upper-case-p (string regexp-flag)
|
||
"Return t if there are no upper case chars in STRING.
|
||
If REGEXP-FLAG is non-nil, disregard letters preceded by `\\' (but not `\\\\')
|
||
since they have special meaning in a regexp."
|
||
(let (quote-flag (i 0) (len (length string)) found)
|
||
(while (and (not found) (< i len))
|
||
(let ((char (aref string i)))
|
||
(if (and regexp-flag (eq char ?\\))
|
||
(setq quote-flag (not quote-flag))
|
||
(if (and (not quote-flag) (not (eq char (downcase char))))
|
||
(setq found t))))
|
||
(setq i (1+ i)))
|
||
(not found)))
|
||
|
||
;; 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)))
|
||
|
||
;; 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)
|
||
(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.el ends here
|