1993-03-17 17:17:05 +00:00
|
|
|
|
;;; isearch.el --- incremental search minor mode.
|
1993-03-17 15:58:09 +00:00
|
|
|
|
|
1993-06-06 22:11:22 +00:00
|
|
|
|
;; Copyright (C) 1992, 1993 Free Software Foundation, Inc.
|
1992-07-22 04:22:42 +00:00
|
|
|
|
|
1993-03-17 15:58:09 +00:00
|
|
|
|
;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
|
|
|
|
|
|
1994-01-10 22:27:52 +00:00
|
|
|
|
;; |$Date: 1994/01/02 17:43:16 $|$Revision: 1.59 $
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1993-10-09 20:00:23 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
|
;; but WITHOUT ANY WARRANTY. No author or distributor
|
|
|
|
|
;; accepts responsibility to anyone for the consequences of using it
|
|
|
|
|
;; or for whether it serves any particular purpose or works at all,
|
|
|
|
|
;; unless he says so in writing. Refer to the GNU Emacs General Public
|
|
|
|
|
;; License for full details.
|
|
|
|
|
|
|
|
|
|
;; Everyone is granted permission to copy, modify and redistribute
|
|
|
|
|
;; GNU Emacs, but only under the conditions described in the
|
|
|
|
|
;; GNU Emacs General Public License. A copy of this license is
|
|
|
|
|
;; supposed to have been given to you along with GNU Emacs so you
|
|
|
|
|
;; can know your rights and responsibilities. It should be in a
|
|
|
|
|
;; file named COPYING. Among other things, the copyright notice
|
|
|
|
|
;; and this notice must be preserved on all copies.
|
|
|
|
|
|
1993-03-17 15:58:09 +00:00
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;;;====================================================================
|
|
|
|
|
;; Instructions
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; 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).
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; The key bindings active within isearch-mode are defined below in
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; `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
|
1993-06-09 11:59:12 +00:00
|
|
|
|
;; - Integrate the emacs 19 generalized command history.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; - Think about incorporating query-replace.
|
|
|
|
|
;; - Hooks and options for failed search.
|
1992-07-16 06:28:10 +00:00
|
|
|
|
|
1993-03-17 15:58:09 +00:00
|
|
|
|
;;; Change Log:
|
|
|
|
|
|
1993-05-19 04:44:42 +00:00
|
|
|
|
;;; Changes before those recorded in ChangeLog:
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; 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.
|
1992-07-16 06:28:10 +00:00
|
|
|
|
;;;
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; 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.
|
1992-07-16 06:28:10 +00:00
|
|
|
|
|
|
|
|
|
;;; Changes for 1.1
|
|
|
|
|
;;; 3/18/92 Fixed invalid-regexp.
|
|
|
|
|
;;; 3/18/92 Fixed yanking in regexps.
|
|
|
|
|
|
1993-03-17 15:58:09 +00:00
|
|
|
|
;;; Code:
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;=========================================================================
|
|
|
|
|
;;; Emacs features
|
|
|
|
|
|
|
|
|
|
;; isearch-mode takes advantage of the features provided by several
|
|
|
|
|
;; different versions of emacs. Rather than testing the version of
|
|
|
|
|
;; emacs, several constants are defined, one for each of the features.
|
|
|
|
|
;; Each of the tests below must work on any version of emacs.
|
|
|
|
|
;; (Perhaps provide and featurep could be used for this purpose.)
|
|
|
|
|
|
1992-11-07 06:17:04 +00:00
|
|
|
|
(defconst isearch-gnu-emacs-events (fboundp 'set-frame-height)) ;; emacs 19
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defconst isearch-pre-command-hook-exists (boundp 'pre-command-hook)) ;; lemacs
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(defconst isearch-event-data-type nil) ;; lemacs
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1992-09-14 22:50:18 +00:00
|
|
|
|
(defconst search-exit-option t
|
1992-09-19 19:21:09 +00:00
|
|
|
|
"*Non-nil means random control characters terminate incremental search.")
|
1992-09-14 22:50:18 +00:00
|
|
|
|
|
|
|
|
|
(defvar 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.")
|
|
|
|
|
|
|
|
|
|
(defvar 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.")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
;;;========================================================================
|
|
|
|
|
;;; Some additional options and constants.
|
|
|
|
|
|
1993-06-06 22:11:22 +00:00
|
|
|
|
(defvar search-upper-case 'not-yanks
|
1992-06-24 05:05:16 +00:00
|
|
|
|
"*If non-nil, upper case chars disable case fold searching.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
That is, upper and lower case chars must match exactly.
|
|
|
|
|
This applies no matter where the chars come from, but does not
|
1992-09-14 22:50:18 +00:00
|
|
|
|
apply to chars in regexps that are prefixed with `\\'.
|
|
|
|
|
If this value is `not-yanks', yanked text is always downcased.")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defvar search-nonincremental-instead t
|
|
|
|
|
"*If non-nil, do a nonincremental search instead if exiting immediately.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
Actually, `isearch-edit-string' is called to let you enter the search
|
|
|
|
|
string, and RET terminates editing and does a nonincremental search.")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defconst 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.")
|
|
|
|
|
|
1992-09-19 19:21:09 +00:00
|
|
|
|
;; I removed the * from the doc string because highlighting is not
|
|
|
|
|
;; currently a clean thing to do. Once highlighting is made clean,
|
|
|
|
|
;; this feature can be re-enabled and advertised.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar search-highlight nil
|
1993-06-06 22:11:22 +00:00
|
|
|
|
"*Non-nil means incremental search highlights the current match.")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
(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.")
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;;;==================================================================
|
|
|
|
|
;;; Search ring.
|
|
|
|
|
|
|
|
|
|
(defvar search-ring nil
|
|
|
|
|
"List of search string sequences.")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar regexp-search-ring nil
|
1992-06-24 05:05:16 +00:00
|
|
|
|
"List of regular expression search string sequences.")
|
|
|
|
|
|
|
|
|
|
(defconst search-ring-max 16
|
|
|
|
|
"*Maximum length of search ring before oldest elements are thrown away.")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defconst regexp-search-ring-max 16
|
|
|
|
|
"*Maximum length of regexp search ring before oldest elements are thrown away.")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defvar search-ring-yank-pointer nil
|
1992-09-15 10:00:34 +00:00
|
|
|
|
"Index in `search-ring' of last string reused.
|
|
|
|
|
nil if none yet.")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar regexp-search-ring-yank-pointer nil
|
1992-09-15 10:00:34 +00:00
|
|
|
|
"Index in `regexp-search-ring' of last string reused.
|
|
|
|
|
nil if none yet.")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar 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.")
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;;;====================================================
|
|
|
|
|
;;; Define isearch-mode keymap.
|
|
|
|
|
|
|
|
|
|
(defvar isearch-mode-map nil
|
|
|
|
|
"Keymap for isearch-mode.")
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(or isearch-mode-map
|
|
|
|
|
(let* ((i 0)
|
1992-09-14 22:50:18 +00:00
|
|
|
|
(map (make-keymap)))
|
1993-05-18 15:46:30 +00:00
|
|
|
|
(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))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1992-10-20 21:21:47 +00:00
|
|
|
|
;; Make function keys, etc, exit the search.
|
|
|
|
|
(define-key map [t] 'isearch-other-control-char)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; Control chars, by default, end isearch mode transparently.
|
1992-10-20 21:21:47 +00:00
|
|
|
|
;; 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.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(while (< i ?\ )
|
|
|
|
|
(define-key map (make-string 1 i) 'isearch-other-control-char)
|
|
|
|
|
(setq i (1+ i)))
|
|
|
|
|
|
1993-05-19 04:44:42 +00:00
|
|
|
|
;; Printing chars extend the search string by default.
|
1992-10-20 21:21:47 +00:00
|
|
|
|
(setq i ?\ )
|
1993-05-14 18:02:55 +00:00
|
|
|
|
(while (< i (length (nth 1 map)))
|
1993-05-19 04:44:42 +00:00
|
|
|
|
(define-key map (vector i) 'isearch-printing-char)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(setq i (1+ i)))
|
|
|
|
|
|
|
|
|
|
;; 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)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(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)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(define-key map "\C-w" 'isearch-yank-word)
|
|
|
|
|
(define-key map "\C-y" 'isearch-yank-line)
|
1993-10-24 04:05:22 +00:00
|
|
|
|
(define-key map [mouse-2] 'isearch-yank-kill)
|
|
|
|
|
;; This overrides the default binding for t.
|
|
|
|
|
(define-key map [down-mouse-2] 'nil)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1993-03-07 20:17:27 +00:00
|
|
|
|
;; Bind the ASCII-equivalent "function keys" explicitly
|
|
|
|
|
;; if we bind their equivalents,
|
|
|
|
|
;; since otherwise the default binding would override.
|
|
|
|
|
;; We bind [escape] below.
|
|
|
|
|
(define-key map [tab] 'isearch-printing-char)
|
1993-12-25 00:50:10 +00:00
|
|
|
|
(define-key map [kp-0] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-1] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-2] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-3] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-4] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-5] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-6] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-7] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-8] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-9] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-add] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-subtract] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-multiply] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-divide] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-decimal] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-separator] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-equal] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-tab] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-space] 'isearch-printing-char)
|
|
|
|
|
(define-key map [kp-enter] 'isearch-exit)
|
1993-03-07 20:17:27 +00:00
|
|
|
|
(define-key map [delete] 'isearch-delete-char)
|
|
|
|
|
(define-key map [backspace] 'isearch-delete-char)
|
|
|
|
|
(define-key map [return] 'isearch-exit)
|
|
|
|
|
(define-key map [newline] 'isearch-printing-char)
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; 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)
|
|
|
|
|
|
1993-03-30 19:38:34 +00:00
|
|
|
|
;;; 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)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;; 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.
|
1993-03-07 20:17:27 +00:00
|
|
|
|
(let ((meta-map (make-sparse-keymap)))
|
|
|
|
|
(define-key map (char-to-string meta-prefix-char) meta-map)
|
|
|
|
|
(define-key map [escape] meta-map))
|
1992-10-20 21:21:47 +00:00
|
|
|
|
(define-key map (vector meta-prefix-char t) 'isearch-other-meta-char)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
(define-key map "\M-n" 'isearch-ring-advance)
|
|
|
|
|
(define-key map "\M-p" 'isearch-ring-retreat)
|
1993-10-24 04:05:22 +00:00
|
|
|
|
(define-key map "\M-y" 'isearch-yank-kill)
|
1992-11-07 06:17:04 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(define-key map "\M-\t" 'isearch-complete)
|
|
|
|
|
|
|
|
|
|
;; For emacs 19, switching frames should terminate isearch-mode
|
1992-11-07 06:17:04 +00:00
|
|
|
|
(if isearch-gnu-emacs-events
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(define-key map [switch-frame] 'isearch-switch-frame-handler))
|
|
|
|
|
|
|
|
|
|
(setq isearch-mode-map map)
|
|
|
|
|
))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; Some bindings you may want to put in your isearch-mode-hook.
|
|
|
|
|
;; Suggest some alternates...
|
|
|
|
|
;; (define-key isearch-mode-map "\C-t" 'isearch-toggle-regexp)
|
|
|
|
|
;; (define-key isearch-mode-map "\C-^" 'isearch-edit-string)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar minibuffer-local-isearch-map nil
|
|
|
|
|
"Keymap for editing isearch strings in the minibuffer.")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(or minibuffer-local-isearch-map
|
|
|
|
|
(let ((map (copy-keymap minibuffer-local-map)))
|
|
|
|
|
(define-key map "\r" 'isearch-nonincremental-exit-minibuffer)
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(define-key map "\M-n" 'isearch-ring-advance-edit)
|
|
|
|
|
(define-key map "\M-p" 'isearch-ring-retreat-edit)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(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)
|
|
|
|
|
))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
;;;========================================================
|
|
|
|
|
;; Internal variables declared globally for byte-compiler.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; 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-other-end nil) ; Start (end) of match if forward (backward).
|
|
|
|
|
(defvar isearch-wrapped nil) ; Searching restarted from the top (bottom).
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(defvar isearch-barrier 0)
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-case-fold-search nil) ; case-fold-search while searching.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defvar isearch-adjusted nil)
|
|
|
|
|
(defvar isearch-slow-terminal-mode nil)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; If t, using a small window.
|
|
|
|
|
(defvar isearch-small-window nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(defvar isearch-opoint 0)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; The window configuration active at the beginning of the search.
|
|
|
|
|
(defvar isearch-window-configuration nil)
|
|
|
|
|
(defvar isearch-old-local-map nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; Flag to indicate a yank occurred, so don't move the cursor.
|
|
|
|
|
(defvar isearch-yank-flag nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; 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)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; Is isearch-mode in a recursive edit for modal searching.
|
|
|
|
|
(defvar isearch-recursive-edit nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; 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)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;==============================================================
|
|
|
|
|
;; 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))))
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-mode nil) ;; Name of the minor mode, if non-nil.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(make-variable-buffer-local 'isearch-mode)
|
|
|
|
|
|
1992-09-14 22:50:18 +00:00
|
|
|
|
(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)
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;;;===============================================================
|
|
|
|
|
;;; Entry points to isearch-mode.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; These four functions should replace those in loaddefs.el
|
1993-04-23 07:31:14 +00:00
|
|
|
|
;;; An alternative is to defalias isearch-forward etc to isearch-mode,
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; and look at this-command to set the options accordingly.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(defun isearch-forward (&optional regexp-p no-recursive-edit)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
"\
|
|
|
|
|
Do incremental search forward.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
With a prefix argument, do an incremental regular expression search instead.
|
|
|
|
|
\\<isearch-mode-map>
|
1992-06-24 05:05:16 +00:00
|
|
|
|
As you type characters, they add to the search string and are found.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
The following non-printing keys are bound in `isearch-mode-map'.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
Type \\[isearch-delete-char] to cancel characters from end of search string.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
Type \\[isearch-exit] to exit, leaving point at location found.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
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.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
Type \\[isearch-quote-char] to quote control character to search for it.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
\\[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.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
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.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
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.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
The above keys, bound in `isearch-mode-map', are often controlled by
|
|
|
|
|
options; do M-x apropos on search-.* to find them.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
Other control and meta characters terminate the search
|
1992-09-14 22:31:47 +00:00
|
|
|
|
and are then executed normally (depending on `search-exit-option').
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
If this function is called non-interactively, it does not return to
|
|
|
|
|
the calling function until the search is done."
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(interactive "P\np")
|
1993-02-17 21:30:25 +00:00
|
|
|
|
(isearch-mode t (not (null regexp-p)) nil (not no-recursive-edit)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(defun isearch-forward-regexp (&optional not-regexp no-recursive-edit)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
"\
|
|
|
|
|
Do incremental search forward for regular expression.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
With a prefix argument, do a regular string search instead.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
Like ordinary incremental search except that your input
|
|
|
|
|
is treated as a regexp. See \\[isearch-forward] for more info."
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(interactive "P\np")
|
1993-02-17 21:30:25 +00:00
|
|
|
|
(isearch-mode t (null not-regexp) nil (not no-recursive-edit)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(defun isearch-backward (&optional regexp-p no-recursive-edit)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
"\
|
|
|
|
|
Do incremental search backward.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
With a prefix argument, do a regular expression search instead.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
See \\[isearch-forward] for more information."
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(interactive "P\np")
|
1993-02-17 21:30:25 +00:00
|
|
|
|
(isearch-mode nil (not (null regexp-p)) nil (not no-recursive-edit)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(defun isearch-backward-regexp (&optional not-regexp no-recursive-edit)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
"\
|
|
|
|
|
Do incremental search backward for regular expression.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
With a prefix argument, do a regular string search instead.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
Like ordinary incremental search except that your input
|
|
|
|
|
is treated as a regexp. See \\[isearch-forward] for more info."
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(interactive "P\np")
|
1993-02-17 21:30:25 +00:00
|
|
|
|
(isearch-mode nil (null not-regexp) nil (not no-recursive-edit)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun isearch-mode-help ()
|
|
|
|
|
(interactive)
|
|
|
|
|
(describe-function 'isearch-forward)
|
|
|
|
|
(isearch-update))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;==================================================================
|
|
|
|
|
;; isearch-mode only sets up incremental search for the minor mode.
|
|
|
|
|
;; All the work is done by the isearch-mode commands.
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; Not used yet:
|
|
|
|
|
;;(defconst 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)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
"Start isearch minor mode. Called by isearch-forward, etc."
|
|
|
|
|
|
|
|
|
|
;; Initialize global vars.
|
|
|
|
|
(setq isearch-forward forward
|
|
|
|
|
isearch-regexp regexp
|
1992-09-14 22:31:47 +00:00
|
|
|
|
isearch-word word-p
|
1992-06-24 05:05:16 +00:00
|
|
|
|
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
|
1992-09-18 07:43:41 +00:00
|
|
|
|
;; Use (baud-rate) for now, for sake of other versions.
|
|
|
|
|
isearch-slow-terminal-mode (and (<= (baud-rate) search-slow-speed)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(> (window-height)
|
|
|
|
|
(* 4 search-slow-window-lines)))
|
|
|
|
|
isearch-other-end nil
|
|
|
|
|
isearch-small-window nil
|
|
|
|
|
|
|
|
|
|
isearch-opoint (point)
|
1992-09-15 10:00:34 +00:00
|
|
|
|
isearch-old-local-map (current-local-map)
|
|
|
|
|
search-ring-yank-pointer nil
|
|
|
|
|
regexp-search-ring-yank-pointer nil)
|
1994-01-10 22:27:52 +00:00
|
|
|
|
(setq isearch-window-configuration
|
|
|
|
|
(if isearch-slow-terminal-mode (current-window-configuration) nil))
|
1993-06-04 06:40:45 +00:00
|
|
|
|
|
1993-03-07 08:43:57 +00:00
|
|
|
|
;; This was for Lucid Emacs. But now that we have pre-command-hook,
|
|
|
|
|
;; it causes trouble.
|
|
|
|
|
;; (if isearch-pre-command-hook-exists
|
|
|
|
|
;; (add-hook 'pre-command-hook 'isearch-pre-command-hook))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(setq isearch-mode " Isearch") ;; forward? regexp?
|
|
|
|
|
(set-buffer-modified-p (buffer-modified-p)) ; update modeline
|
|
|
|
|
|
1993-05-17 18:22:37 +00:00
|
|
|
|
;; It is ugly to show region highlighting while the search
|
|
|
|
|
;; is going on. And we don't want the mark active at the end either.
|
|
|
|
|
(setq deactivate-mark t)
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(isearch-push-state)
|
|
|
|
|
|
|
|
|
|
(use-local-map isearch-mode-map)
|
|
|
|
|
(isearch-update)
|
|
|
|
|
(run-hooks 'isearch-mode-hook)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;; 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.
|
1993-06-01 04:52:28 +00:00
|
|
|
|
(if recursive-edit
|
|
|
|
|
(let ((isearch-recursive-edit t))
|
|
|
|
|
(recursive-edit)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;====================================================
|
|
|
|
|
;; Some high level utilities. Others below.
|
|
|
|
|
|
|
|
|
|
(defun isearch-update ()
|
|
|
|
|
;; Called after each command to update the display.
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(if (if isearch-event-data-type
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(null unread-command-event)
|
1992-11-07 06:17:04 +00:00
|
|
|
|
(if isearch-gnu-emacs-events
|
1993-01-26 01:58:16 +00:00
|
|
|
|
(null unread-command-events)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(< unread-command-char 0)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(progn
|
|
|
|
|
(if (not (input-pending-p))
|
|
|
|
|
(isearch-message))
|
|
|
|
|
(if (and isearch-slow-terminal-mode
|
|
|
|
|
(not (or isearch-small-window
|
|
|
|
|
(pos-visible-in-window-p))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(let ((found-point (point)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(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))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(goto-char found-point)))
|
|
|
|
|
(if isearch-other-end
|
|
|
|
|
(if (< isearch-other-end (point)) ; isearch-forward?
|
|
|
|
|
(isearch-highlight isearch-other-end (point))
|
1993-12-24 03:30:11 +00:00
|
|
|
|
(isearch-highlight (point) isearch-other-end))
|
|
|
|
|
(isearch-dehighlight nil))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(setq ;; quit-flag nil not for isearch-mode
|
|
|
|
|
isearch-adjusted nil
|
|
|
|
|
isearch-yank-flag nil)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(defun isearch-done (&optional nopush)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; Called by all commands that terminate isearch-mode.
|
1992-09-21 08:28:43 +00:00
|
|
|
|
;; If NOPUSH is non-nil, we don't push the string on the search ring.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(use-local-map isearch-old-local-map)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
|
|
|
|
|
(isearch-dehighlight t)
|
|
|
|
|
(let ((found-start (window-start (selected-window)))
|
|
|
|
|
(found-point (point)))
|
1993-06-04 06:40:45 +00:00
|
|
|
|
(if isearch-window-configuration
|
|
|
|
|
(set-window-configuration isearch-window-configuration))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1993-07-31 18:39:09 +00:00
|
|
|
|
(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)))
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; If there was movement, mark the starting position.
|
|
|
|
|
;; Maybe should test difference between and set mark iff > threshold.
|
|
|
|
|
(if (/= (point) isearch-opoint)
|
1993-03-30 19:42:10 +00:00
|
|
|
|
(progn
|
|
|
|
|
(push-mark isearch-opoint t)
|
1993-07-08 22:33:57 +00:00
|
|
|
|
(deactivate-mark)
|
1993-03-30 19:42:10 +00:00
|
|
|
|
(or executing-macro (> (minibuffer-depth) 0)
|
|
|
|
|
(message "Mark saved where search started")))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; (message "") why is this needed?
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
(setq isearch-mode nil)
|
|
|
|
|
(set-buffer-modified-p (buffer-modified-p)) ;; update modeline
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(if (and (> (length isearch-string) 0) (not nopush))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; Update the ring data.
|
|
|
|
|
(if isearch-regexp
|
1992-09-19 19:21:09 +00:00
|
|
|
|
(if (or (null regexp-search-ring)
|
|
|
|
|
(not (string= isearch-string (car regexp-search-ring))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(progn
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(setq regexp-search-ring
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(cons isearch-string regexp-search-ring))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if (> (length regexp-search-ring) regexp-search-ring-max)
|
|
|
|
|
(setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
nil))))
|
1992-09-19 19:21:09 +00:00
|
|
|
|
(if (or (null search-ring)
|
|
|
|
|
(not (string= isearch-string (car search-ring))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(progn
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(setq search-ring (cons isearch-string search-ring))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(if (> (length search-ring) search-ring-max)
|
|
|
|
|
(setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
|
|
|
|
|
|
|
|
|
|
(run-hooks 'isearch-mode-end-hook)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if isearch-recursive-edit (exit-recursive-edit)))
|
|
|
|
|
|
|
|
|
|
;;;=======================================================
|
|
|
|
|
;;; Switching buffers should first terminate isearch-mode.
|
1993-06-09 11:59:12 +00:00
|
|
|
|
;;; This is done quite differently for each variant of emacs.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;;; 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)
|
1993-03-21 05:50:17 +00:00
|
|
|
|
(handle-switch-frame (car (cdr (isearch-last-command-char)))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;;;========================================================
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;====================================================
|
|
|
|
|
;; 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
|
1992-09-14 22:31:47 +00:00
|
|
|
|
nonincremental search instead via `isearch-edit-string'."
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
(if (and search-nonincremental-instead
|
|
|
|
|
(= 0 (length isearch-string)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(let ((isearch-nonincremental t))
|
|
|
|
|
(isearch-edit-string)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(isearch-done))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun isearch-edit-string ()
|
1992-09-14 22:31:47 +00:00
|
|
|
|
"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-backward-exit-minibuffer] to resume isearching backward.
|
|
|
|
|
\\[isearch-ring-advance-edit] to replace the search string with the next item in the search ring.
|
1993-06-09 11:59:12 +00:00
|
|
|
|
\\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
\\[isearch-complete-edit] to complete the search string using the search ring.
|
|
|
|
|
|
|
|
|
|
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.
|
1993-06-09 11:59:12 +00:00
|
|
|
|
;; Editing doesn't back up the search point. Should it?
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(interactive)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(condition-case err
|
1993-07-15 03:46:02 +00:00
|
|
|
|
(let ((isearch-nonincremental isearch-nonincremental)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;; 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-other-end isearch-other-end)
|
|
|
|
|
(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
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(isearch-done t)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(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
|
1992-10-27 04:11:46 +00:00
|
|
|
|
(e (let ((cursor-in-echo-area t))
|
1993-08-13 06:32:49 +00:00
|
|
|
|
(read-event)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; Binding minibuffer-history-symbol to nil is a work-around
|
|
|
|
|
;; for some incompatibility with gmhist.
|
|
|
|
|
(minibuffer-history-symbol))
|
|
|
|
|
;; 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
|
1993-08-13 06:32:49 +00:00
|
|
|
|
(lookup-key isearch-mode-map (vector e)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(setq isearch-word t ;; so message-prefix is right
|
|
|
|
|
isearch-new-word t)
|
|
|
|
|
(isearch-unread e))
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(setq cursor-in-echo-area nil)
|
|
|
|
|
(setq isearch-new-string
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(let (junk-ring)
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(read-from-minibuffer (isearch-message-prefix)
|
|
|
|
|
isearch-string
|
|
|
|
|
minibuffer-local-isearch-map nil
|
1992-09-21 08:28:43 +00:00
|
|
|
|
'junk-ring))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
isearch-new-message (mapconcat 'text-char-description
|
|
|
|
|
isearch-new-string "")))
|
|
|
|
|
;; Always resume isearching by restarting it.
|
|
|
|
|
(isearch-mode isearch-forward
|
|
|
|
|
isearch-regexp
|
|
|
|
|
isearch-op-fun
|
|
|
|
|
isearch-recursive-edit
|
|
|
|
|
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))
|
1992-09-19 19:21:09 +00:00
|
|
|
|
(setq isearch-string (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.
|
|
|
|
|
)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;; Reinvoke the pending search.
|
|
|
|
|
(isearch-push-state)
|
|
|
|
|
(isearch-search)
|
|
|
|
|
(isearch-update)
|
|
|
|
|
(if isearch-nonincremental
|
|
|
|
|
(progn
|
|
|
|
|
;; (sit-for 1) ;; needed if isearch-done does: (message "")
|
|
|
|
|
(isearch-done))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(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))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defun isearch-reverse-exit-minibuffer ()
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(interactive)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(setq isearch-new-forward nil)
|
|
|
|
|
(exit-minibuffer))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun isearch-abort ()
|
|
|
|
|
"Abort incremental search mode if searching is successful, signalling quit.
|
|
|
|
|
Otherwise, revert to previous successful search and continue searching.
|
|
|
|
|
Use `isearch-exit' to quit without signalling."
|
|
|
|
|
(interactive)
|
1993-06-09 11:59:12 +00:00
|
|
|
|
;; (ding) signal instead below, if quitting
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(discard-input)
|
|
|
|
|
(if isearch-success
|
|
|
|
|
;; If search is successful, move back to starting point
|
|
|
|
|
;; and really do quit.
|
|
|
|
|
(progn (goto-char isearch-opoint)
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(isearch-done t) ; exit isearch
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(signal 'quit nil)) ; and pass on quit signal
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; If search is failing, rub out until it is once more successful.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(while (not isearch-success) (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
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(car regexp-search-ring)
|
|
|
|
|
(car search-ring))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
"")
|
|
|
|
|
isearch-message
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(mapconcat 'isearch-text-char-description
|
1992-06-24 05:05:16 +00:00
|
|
|
|
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.
|
1994-01-02 17:43:16 +00:00
|
|
|
|
|
|
|
|
|
(if (equal isearch-string "")
|
|
|
|
|
(setq isearch-success t)
|
|
|
|
|
(if (and isearch-success (equal (match-end 0) (match-beginning 0)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; If repeating a search that found
|
|
|
|
|
;; an empty string, ensure we advance.
|
1994-01-02 17:43:16 +00:00
|
|
|
|
(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)))
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(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))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if isearch-regexp (setq isearch-word nil))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(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
|
1993-10-24 04:05:22 +00:00
|
|
|
|
;; CHUNK should be word, line or kill.
|
|
|
|
|
(let ((string (cond
|
|
|
|
|
((eq chunk 'kill)
|
|
|
|
|
(current-kill 0))
|
|
|
|
|
(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))))))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; Downcase the string if not supposed to case-fold yanked strings.
|
|
|
|
|
(if (and isearch-case-fold-search
|
1992-09-14 22:50:18 +00:00
|
|
|
|
(eq 'not-yanks search-upper-case))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(setq string (downcase string)))
|
|
|
|
|
(if isearch-regexp (setq string (regexp-quote string)))
|
|
|
|
|
(setq isearch-string (concat isearch-string string)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
isearch-message
|
|
|
|
|
(concat isearch-message
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(mapconcat 'isearch-text-char-description
|
|
|
|
|
string ""))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; Don't move cursor in reverse search.
|
|
|
|
|
isearch-yank-flag t))
|
|
|
|
|
(isearch-search-and-update))
|
|
|
|
|
|
1993-10-24 04:05:22 +00:00
|
|
|
|
(defun isearch-yank-kill ()
|
|
|
|
|
"Pull string from kill ring into search string."
|
|
|
|
|
(interactive)
|
|
|
|
|
(isearch-yank 'kill))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(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 ()
|
|
|
|
|
(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-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.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; They can make a regexp match sooner or make it succeed instead of failing.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; So go back to place last successful search started
|
|
|
|
|
;; or to the last ^S/^R (barrier), whichever is nearer.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; + needs no special handling because the string must match at least once.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-*-char ()
|
|
|
|
|
"Handle * and ? specially in regexps."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if isearch-regexp
|
|
|
|
|
|
|
|
|
|
(progn
|
|
|
|
|
(setq isearch-adjusted t)
|
|
|
|
|
(let ((cs (nth (if isearch-forward
|
|
|
|
|
5 ; isearch-other-end
|
|
|
|
|
2) ; saved (point)
|
|
|
|
|
(car (cdr isearch-cmds)))))
|
|
|
|
|
;; (car isearch-cmds) is after last search;
|
|
|
|
|
;; (car (cdr isearch-cmds)) is from before it.
|
|
|
|
|
(setq cs (or cs isearch-barrier))
|
|
|
|
|
(goto-char
|
|
|
|
|
(if isearch-forward
|
|
|
|
|
(max cs isearch-barrier)
|
|
|
|
|
(min cs isearch-barrier))))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(isearch-process-search-char (isearch-last-command-char)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(defun isearch-|-char ()
|
|
|
|
|
"If in regexp search, jump to the barrier."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if isearch-regexp
|
|
|
|
|
(progn
|
|
|
|
|
(setq isearch-adjusted t)
|
|
|
|
|
(goto-char isearch-barrier)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(isearch-process-search-char (isearch-last-command-char)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
1993-04-23 07:31:14 +00:00
|
|
|
|
(defalias 'isearch-other-control-char 'isearch-other-meta-char)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-other-meta-char ()
|
1993-03-06 06:15:05 +00:00
|
|
|
|
"Exit the search normally and reread this key sequence.
|
1992-09-21 08:28:43 +00:00
|
|
|
|
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."
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(interactive)
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(cond ((eq search-exit-option 'edit)
|
|
|
|
|
(let ((key (this-command-keys)))
|
1993-03-07 20:17:27 +00:00
|
|
|
|
(apply 'isearch-unread (listify-key-sequence key)))
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(isearch-edit-string))
|
|
|
|
|
(search-exit-option
|
1993-06-04 06:40:45 +00:00
|
|
|
|
(let ((key (this-command-keys))
|
1993-07-02 21:34:15 +00:00
|
|
|
|
(index 0)
|
1993-06-04 06:40:45 +00:00
|
|
|
|
window)
|
|
|
|
|
(apply 'isearch-unread (listify-key-sequence key))
|
1993-07-02 21:34:15 +00:00
|
|
|
|
;; 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))
|
1993-11-24 01:22:40 +00:00
|
|
|
|
;; These events now have a symbol; they used to have a list.
|
|
|
|
|
;; Accept either one. Other events have a number here.
|
|
|
|
|
(not (numberp (posn-point (event-start (aref key 1)))))
|
1993-07-02 21:34:15 +00:00
|
|
|
|
(setq index 1))
|
1993-06-04 06:40:45 +00:00
|
|
|
|
;; 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.
|
1993-07-02 21:34:15 +00:00
|
|
|
|
(if (and (listp (aref key index))
|
|
|
|
|
(setq window (posn-window (event-start (aref key index))))
|
1993-06-04 06:40:45 +00:00
|
|
|
|
(windowp window))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(set-buffer (window-buffer window))
|
|
|
|
|
(isearch-done))
|
|
|
|
|
(isearch-done))))
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(t;; otherwise nil
|
|
|
|
|
(isearch-process-search-string (this-command-keys)
|
|
|
|
|
(this-command-keys)))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(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 ()
|
1993-04-14 19:40:53 +00:00
|
|
|
|
"Add this ordinary printing character to the search string and search."
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(interactive)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(isearch-process-search-char (isearch-last-command-char)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-whitespace-chars ()
|
1992-09-14 22:31:47 +00:00
|
|
|
|
"Match all whitespace chars, if in regexp mode.
|
1993-04-14 19:40:53 +00:00
|
|
|
|
If you want to search for just a space, type C-q SPC."
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(interactive)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if isearch-regexp
|
|
|
|
|
(if search-whitespace-regexp
|
|
|
|
|
(isearch-process-search-string search-whitespace-regexp " ")
|
|
|
|
|
(isearch-printing-char))
|
|
|
|
|
(progn
|
1993-06-09 11:59:12 +00:00
|
|
|
|
;; This way of doing word search doesn't correctly extend current search.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; (setq isearch-word t)
|
|
|
|
|
;; (setq isearch-adjusted t)
|
|
|
|
|
;; (goto-char isearch-barrier)
|
|
|
|
|
(isearch-printing-char))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-process-search-char (char)
|
|
|
|
|
;; Append the char to the search string, update the message and re-search.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(isearch-process-search-string
|
|
|
|
|
(isearch-char-to-string char)
|
|
|
|
|
(isearch-text-char-description char)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(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
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defun isearch-ring-adjust1 (advance)
|
|
|
|
|
;; Helper for isearch-ring-adjust
|
|
|
|
|
(let* ((ring (if isearch-regexp regexp-search-ring search-ring))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(length (length ring))
|
|
|
|
|
(yank-pointer-name (if isearch-regexp
|
1992-09-14 22:31:47 +00:00
|
|
|
|
'regexp-search-ring-yank-pointer
|
1992-06-24 05:05:16 +00:00
|
|
|
|
'search-ring-yank-pointer))
|
|
|
|
|
(yank-pointer (eval yank-pointer-name)))
|
|
|
|
|
(if (zerop length)
|
|
|
|
|
()
|
|
|
|
|
(set yank-pointer-name
|
|
|
|
|
(setq yank-pointer
|
1993-08-10 04:14:17 +00:00
|
|
|
|
(mod (+ (or yank-pointer 0)
|
|
|
|
|
(if advance -1 1))
|
|
|
|
|
length)))
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(setq isearch-string (nth yank-pointer ring)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
isearch-message (mapconcat 'isearch-text-char-description
|
|
|
|
|
isearch-string "")))))
|
|
|
|
|
|
|
|
|
|
(defun isearch-ring-adjust (advance)
|
|
|
|
|
;; Helper for isearch-ring-advance and isearch-ring-retreat
|
|
|
|
|
(if (cdr isearch-cmds) ;; is there more than one thing on stack?
|
|
|
|
|
(isearch-pop-state))
|
|
|
|
|
(isearch-ring-adjust1 advance)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(isearch-push-state)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if search-ring-update
|
|
|
|
|
(progn
|
|
|
|
|
(isearch-search)
|
|
|
|
|
(isearch-update))
|
|
|
|
|
(isearch-edit-string)
|
|
|
|
|
))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-ring-advance ()
|
|
|
|
|
"Advance to the next search string in the ring."
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; This could be more general to handle a prefix arg, but who would use it.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(interactive)
|
|
|
|
|
(isearch-ring-adjust 'advance))
|
|
|
|
|
|
|
|
|
|
(defun isearch-ring-retreat ()
|
|
|
|
|
"Retreat to the previous search string in the ring."
|
|
|
|
|
(interactive)
|
|
|
|
|
(isearch-ring-adjust nil))
|
|
|
|
|
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(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
|
1993-08-10 04:14:17 +00:00
|
|
|
|
(mod (- (or yank-pointer 0) n)
|
|
|
|
|
length)))
|
1992-09-15 10:00:34 +00:00
|
|
|
|
|
|
|
|
|
(erase-buffer)
|
1992-09-21 08:28:43 +00:00
|
|
|
|
(insert (nth yank-pointer ring))
|
1992-10-11 05:25:11 +00:00
|
|
|
|
(goto-char (point-max)))))
|
1992-09-15 10:00:34 +00:00
|
|
|
|
|
|
|
|
|
(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))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
(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))) ; shouldnt have to say this
|
|
|
|
|
(if (equal completion isearch-string) ;; no extension?
|
|
|
|
|
(if completion-auto-help
|
|
|
|
|
(with-output-to-temp-buffer "*Isearch completions*"
|
|
|
|
|
(display-completion-list
|
|
|
|
|
(all-completions isearch-string alist))))
|
|
|
|
|
(setq isearch-string completion))
|
|
|
|
|
t)
|
|
|
|
|
(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)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defun isearch-complete-edit ()
|
|
|
|
|
"Same as `isearch-complete' except in the minibuffer."
|
|
|
|
|
(interactive)
|
|
|
|
|
(setq isearch-string (buffer-string))
|
|
|
|
|
(if (isearch-complete1)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(progn
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(erase-buffer)
|
|
|
|
|
(insert isearch-string))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;==============================================================
|
|
|
|
|
;; The search status stack (and isearch window-local variables, not used).
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; Need a structure for this.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(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)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
isearch-word (nth 6 cmd)
|
|
|
|
|
isearch-invalid-regexp (nth 7 cmd)
|
|
|
|
|
isearch-wrapped (nth 8 cmd)
|
|
|
|
|
isearch-barrier (nth 9 cmd))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(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
|
1992-09-14 22:31:47 +00:00
|
|
|
|
isearch-word
|
1992-06-24 05:05:16 +00:00
|
|
|
|
isearch-invalid-regexp isearch-wrapped isearch-barrier)
|
|
|
|
|
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
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(isearch-message-prefix c-q-hack ellipsis isearch-nonincremental)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
isearch-message
|
|
|
|
|
(isearch-message-suffix c-q-hack ellipsis)
|
|
|
|
|
)))
|
|
|
|
|
(if c-q-hack m (message "%s" m))))
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defun isearch-message-prefix (&optional c-q-hack ellipsis nonincremental)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; 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))
|
|
|
|
|
(error nil)))
|
|
|
|
|
;; If currently failing, display no ellipsis.
|
|
|
|
|
(or isearch-success (setq ellipsis nil))
|
|
|
|
|
(let ((m (concat (if isearch-success "" "failing ")
|
|
|
|
|
(if isearch-wrapped "wrapped ")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if isearch-word "word " "")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(if isearch-regexp "regexp " "")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if nonincremental "search" "I-search")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(if isearch-forward ": " " backward: ")
|
|
|
|
|
)))
|
|
|
|
|
(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)
|
1993-05-29 06:27:47 +00:00
|
|
|
|
(if (and isearch-case-fold-search search-upper-case)
|
1993-06-06 22:11:22 +00:00
|
|
|
|
(setq isearch-case-fold-search
|
|
|
|
|
(isearch-no-upper-case-p isearch-string isearch-regexp)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(condition-case lossage
|
|
|
|
|
(let ((inhibit-quit nil)
|
|
|
|
|
(case-fold-search isearch-case-fold-search))
|
|
|
|
|
(if isearch-regexp (setq isearch-invalid-regexp nil))
|
|
|
|
|
(setq isearch-success
|
|
|
|
|
(funcall
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(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)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
isearch-string nil t))
|
|
|
|
|
(if isearch-success
|
|
|
|
|
(setq isearch-other-end
|
|
|
|
|
(if isearch-forward (match-beginning 0) (match-end 0)))))
|
|
|
|
|
|
1993-11-26 22:20:23 +00:00
|
|
|
|
(quit (isearch-unread ?\C-g)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(setq isearch-success nil))
|
|
|
|
|
|
|
|
|
|
(invalid-regexp
|
|
|
|
|
(setq isearch-invalid-regexp (car (cdr lossage)))
|
|
|
|
|
(if (string-match
|
|
|
|
|
"\\`Premature \\|\\`Unmatched \\|\\`Invalid "
|
|
|
|
|
isearch-invalid-regexp)
|
1992-11-01 22:10:59 +00:00
|
|
|
|
(setq isearch-invalid-regexp "incomplete input")))
|
|
|
|
|
(error
|
|
|
|
|
;; stack overflow in regexp search.
|
|
|
|
|
(setq isearch-invalid-regexp (car (cdr lossage)))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(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)))))
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;;========================================================
|
|
|
|
|
;;; Highlighting
|
|
|
|
|
|
1993-06-06 22:11:22 +00:00
|
|
|
|
(defvar isearch-overlay nil)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1993-06-06 22:11:22 +00:00
|
|
|
|
(defun isearch-highlight (beg end)
|
1993-06-13 21:43:15 +00:00
|
|
|
|
(if (null search-highlight)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
nil
|
1993-06-06 22:11:22 +00:00
|
|
|
|
(or isearch-overlay (setq isearch-overlay (make-overlay beg end)))
|
|
|
|
|
(move-overlay isearch-overlay beg end (current-buffer))
|
1993-06-13 21:43:15 +00:00
|
|
|
|
(overlay-put isearch-overlay 'face
|
|
|
|
|
(if (internal-find-face 'isearch nil)
|
|
|
|
|
'isearch 'region))))
|
1993-06-06 22:11:22 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-dehighlight (totally)
|
|
|
|
|
(if isearch-overlay
|
|
|
|
|
(delete-overlay isearch-overlay)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;;;===========================================================
|
|
|
|
|
;;; General utilities
|
|
|
|
|
|
|
|
|
|
|
1993-06-06 22:11:22 +00:00
|
|
|
|
(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 preceeded by `\\' (but not `\\\\')
|
|
|
|
|
since they have special meaning in a regexp."
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(let ((case-fold-search nil))
|
1993-06-06 22:11:22 +00:00
|
|
|
|
(not (string-match (if regexp-flag "\\(^\\|\\\\\\\\\\|[^\\]\\)[A-Z]"
|
|
|
|
|
"[A-Z]")
|
|
|
|
|
string))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;;;=================================================
|
1993-06-06 22:11:22 +00:00
|
|
|
|
;; Portability functions to support various Emacs versions.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; To quiet the byte-compiler.
|
|
|
|
|
(defvar unread-command-event)
|
1993-01-26 01:58:16 +00:00
|
|
|
|
(defvar unread-command-events)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar last-command-event)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defun isearch-char-to-string (c)
|
|
|
|
|
(if (integerp c)
|
|
|
|
|
(make-string 1 c)
|
1993-05-14 18:02:55 +00:00
|
|
|
|
(if (and (symbolp c) (get c 'ascii-character))
|
|
|
|
|
(make-string 1 (get c 'ascii-character))
|
|
|
|
|
(make-string 1 (event-to-character c)))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-text-char-description (c)
|
1993-12-23 03:28:10 +00:00
|
|
|
|
(if (and (integerp c) (or (< c ?\ ) (= c ?\^?)))
|
|
|
|
|
(text-char-description c)
|
|
|
|
|
(isearch-char-to-string c)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1993-03-06 06:15:05 +00:00
|
|
|
|
(defun isearch-unread (&rest char-or-events)
|
|
|
|
|
;; General function to unread characters or events.
|
|
|
|
|
(if isearch-gnu-emacs-events
|
1993-03-07 20:17:27 +00:00
|
|
|
|
(setq unread-command-events
|
|
|
|
|
(append char-or-events unread-command-events))
|
1993-03-06 06:15:05 +00:00
|
|
|
|
(let ((char (if (cdr char-or-events)
|
1993-03-07 04:22:00 +00:00
|
|
|
|
(progn
|
|
|
|
|
(while (cdr char-or-events)
|
|
|
|
|
(setq char-or-events (cdr char-or-events)))
|
|
|
|
|
(+ 128 (car char-or-events)))
|
1993-03-06 06:15:05 +00:00
|
|
|
|
(car char-or-events))))
|
|
|
|
|
(if isearch-event-data-type
|
|
|
|
|
(setq unread-command-event char)
|
|
|
|
|
(setq unread-command-char char)))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-last-command-char ()
|
|
|
|
|
;; General function to return the last command character.
|
1992-09-15 10:00:34 +00:00
|
|
|
|
(if isearch-event-data-type
|
1992-09-14 22:31:47 +00:00
|
|
|
|
last-command-event
|
|
|
|
|
last-command-char))
|
|
|
|
|
|
1993-03-17 15:58:09 +00:00
|
|
|
|
;;; isearch.el ends here
|