2016-09-28 17:08:12 +00:00
|
|
|
|
;;; isearch.el --- incremental search minor mode -*- lexical-binding: t -*-
|
1993-03-17 15:58:09 +00:00
|
|
|
|
|
2018-01-01 08:21:42 +00:00
|
|
|
|
;; Copyright (C) 1992-1997, 1999-2018 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>
|
2014-02-10 01:34:22 +00:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
1999-09-27 22:15:50 +00:00
|
|
|
|
;; Keywords: matching
|
2010-08-29 16:17:13 +00:00
|
|
|
|
;; Package: emacs
|
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
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1994-04-07 20:30:18 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
;; (at your option) any later version.
|
1994-04-07 20:30:18 +00:00
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1994-04-07 20:30:18 +00:00
|
|
|
|
;; 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
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
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
|
1999-09-27 22:15:50 +00:00
|
|
|
|
;; is completed. It uses a recursive-edit to behave this way.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; The key bindings active within isearch-mode are defined below in
|
2015-10-29 00:22:50 +00:00
|
|
|
|
;; `isearch-mode-map'. Also see minibuffer-local-isearch-map
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; for bindings active during `isearch-edit-string'.
|
|
|
|
|
|
1999-09-27 22:15:50 +00:00
|
|
|
|
;; isearch-mode should work even if you switch windows with the mouse,
|
|
|
|
|
;; in which case isearch-mode is terminated automatically before the
|
|
|
|
|
;; switch.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;; 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
|
2013-05-15 23:14:18 +00:00
|
|
|
|
;; exits and searches in the last search direction.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;; 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.
|
|
|
|
|
|
1993-03-17 15:58:09 +00:00
|
|
|
|
;;; Code:
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Some additional options and constants.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1997-05-03 22:35:40 +00:00
|
|
|
|
(defgroup isearch nil
|
|
|
|
|
"Incremental search minor mode."
|
1999-09-27 22:15:50 +00:00
|
|
|
|
:link '(emacs-commentary-link "isearch")
|
|
|
|
|
:link '(custom-manual "(emacs)Incremental Search")
|
1997-05-03 22:35:40 +00:00
|
|
|
|
:prefix "isearch-"
|
|
|
|
|
:prefix "search-"
|
|
|
|
|
:group 'matching)
|
1992-09-14 22:50:18 +00:00
|
|
|
|
|
1997-05-03 22:35:40 +00:00
|
|
|
|
|
|
|
|
|
(defcustom search-exit-option t
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Non-nil means random control characters terminate incremental search."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'boolean)
|
1997-05-03 22:35:40 +00:00
|
|
|
|
|
|
|
|
|
(defcustom search-slow-window-lines 1
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Number of lines in slow search display windows.
|
1992-09-14 22:50:18 +00:00
|
|
|
|
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)
|
1997-05-03 22:35:40 +00:00
|
|
|
|
and the value is minus the number of lines."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'integer)
|
1992-09-14 22:50:18 +00:00
|
|
|
|
|
1997-05-03 22:35:40 +00:00
|
|
|
|
(defcustom search-slow-speed 1200
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Highest terminal speed at which to use \"slow\" style incremental search.
|
1992-09-14 22:50:18 +00:00
|
|
|
|
This is the style where a one-line window is created to show the line
|
1997-05-03 22:35:40 +00:00
|
|
|
|
that the search has reached."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'integer)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1997-05-03 22:35:40 +00:00
|
|
|
|
(defcustom search-upper-case 'not-yanks
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +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 `\\'.
|
2007-12-09 23:47:59 +00:00
|
|
|
|
If this value is `not-yanks', text yanked into the search string
|
|
|
|
|
in Isearch mode is always downcased."
|
1997-05-03 22:35:40 +00:00
|
|
|
|
:type '(choice (const :tag "off" nil)
|
|
|
|
|
(const not-yanks)
|
2015-10-24 23:11:37 +00:00
|
|
|
|
(other :tag "on" t)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1997-05-03 22:35:40 +00:00
|
|
|
|
(defcustom search-nonincremental-instead t
|
2012-01-17 22:33:05 +00:00
|
|
|
|
"If non-nil, do a nonincremental search instead of exiting immediately.
|
2015-11-25 19:09:29 +00:00
|
|
|
|
This affects the behavior of `isearch-exit' and any key bound to that
|
|
|
|
|
command: if this variable is nil, `isearch-exit' always exits the search;
|
|
|
|
|
if the value is non-nil, and the search string is empty, `isearch-exit'
|
|
|
|
|
starts a nonincremental search instead. (Actually, `isearch-edit-string'
|
|
|
|
|
is called to let you enter the search string, and RET terminates editing
|
|
|
|
|
and does a nonincremental search.)"
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'boolean)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
* textmodes/tex-mode.el (tex-alt-dvi-print-command)
(tex-dvi-print-command, tex-bibtex-command, tex-start-commands)
(tex-start-options, slitex-run-command, latex-run-command)
(tex-run-command, tex-directory):
* textmodes/ispell.el (ispell-html-skip-alists)
(ispell-tex-skip-alists, ispell-tex-skip-alists):
* textmodes/fill.el (adaptive-fill-first-line-regexp):
(adaptive-fill-regexp):
* textmodes/dns-mode.el (auto-mode-alist):
* progmodes/python.el (interpreter-mode-alist):
* progmodes/etags.el (tags-compression-info-list):
* progmodes/etags.el (tags-file-name):
* net/browse-url.el (browse-url-galeon-program)
(browse-url-firefox-program):
* mail/sendmail.el (mail-signature-file)
(mail-citation-prefix-regexp):
* international/mule-conf.el (eight-bit):
* international/latexenc.el (latex-inputenc-coding-alist):
* international/fontset.el (x-pixel-size-width-font-regexp):
* emacs-lisp/warnings.el (warning-type-format):
* emacs-lisp/trace.el (trace-buffer):
* emacs-lisp/lisp-mode.el (lisp-interaction-mode-map)
(emacs-lisp-mode-map):
* calendar/holidays.el (holiday-solar-holidays)
(holiday-bahai-holidays, holiday-islamic-holidays)
(holiday-christian-holidays, holiday-hebrew-holidays)
(hebrew-holidays-4, hebrew-holidays-3, hebrew-holidays-2)
(hebrew-holidays-1, holiday-oriental-holidays)
(holiday-general-holidays):
* x-dnd.el (x-dnd-known-types):
* tool-bar.el (tool-bar):
* startup.el (site-run-file):
* shell.el (shell-dumb-shell-regexp):
* rfn-eshadow.el (file-name-shadow-tty-properties)
(file-name-shadow-properties):
* paths.el (remote-shell-program, news-directory):
* mouse.el ([C-down-mouse-3]):
* menu-bar.el (menu-bar-tools-menu):
* jka-cmpr-hook.el (jka-compr-load-suffixes)
(jka-compr-mode-alist-additions, jka-compr-compression-info-list)
(jka-compr-compression-info-list):
* isearch.el (search-whitespace-regexp):
* image-file.el (image-file-name-extensions):
* find-dired.el (find-ls-option):
* files.el (directory-listing-before-filename-regexp)
(directory-free-space-args, insert-directory-program)
(list-directory-brief-switches, magic-fallback-mode-alist)
(magic-fallback-mode-alist, auto-mode-interpreter-regexp)
(automount-dir-prefix):
* faces.el (face-x-resources, x-font-regexp, x-font-regexp-head)
(x-font-regexp-slant, x-font-regexp-weight, face-x-resources)
(face-font-registry-alternatives, face-font-registry-alternatives)
(face-font-family-alternatives):
* facemenu.el (facemenu-add-new-face, facemenu-background-menu)
(facemenu-foreground-menu, facemenu-face-menu):
* epa-hook.el (epa-file-name-regexp):
* dnd.el (dnd-protocol-alist):
* textmodes/rst.el (auto-mode-alist):
* button.el (default-button): Purecopy strings.
2009-11-06 05:16:23 +00:00
|
|
|
|
(defcustom search-whitespace-regexp (purecopy "\\s-+")
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"If non-nil, regular expression to match a sequence of whitespace chars.
|
2012-08-26 03:57:55 +00:00
|
|
|
|
When you enter a space or spaces in the incremental search, it
|
|
|
|
|
will match any sequence matched by this regexp. As an exception,
|
|
|
|
|
spaces are treated normally in regexp incremental search if they
|
|
|
|
|
occur in a regexp construct like [...] or *, + or ?.
|
|
|
|
|
|
2012-09-02 09:31:45 +00:00
|
|
|
|
If the value is a string, it applies to both ordinary and
|
|
|
|
|
regexp incremental search. If the value is nil, or
|
|
|
|
|
`isearch-lax-whitespace' is nil for ordinary incremental search, or
|
|
|
|
|
`isearch-regexp-lax-whitespace' is nil for regexp incremental search,
|
|
|
|
|
then each space you type matches literally, against one space.
|
2012-08-26 03:57:55 +00:00
|
|
|
|
|
2004-12-03 00:30:33 +00:00
|
|
|
|
You might want to use something like \"[ \\t\\r\\n]+\" instead.
|
|
|
|
|
In the Customization buffer, that is `[' followed by a space,
|
2012-08-26 03:57:55 +00:00
|
|
|
|
a tab, a carriage return (control-M), a newline, and `]+'."
|
2012-09-02 09:31:45 +00:00
|
|
|
|
:type '(choice (const :tag "Match Spaces Literally" nil)
|
2006-02-21 19:52:07 +00:00
|
|
|
|
regexp)
|
2012-08-26 03:57:55 +00:00
|
|
|
|
:version "24.3")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(defcustom search-invisible 'open
|
2014-03-01 02:48:54 +00:00
|
|
|
|
"If t incremental search/query-replace can match hidden text.
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
A nil value means don't match invisible text.
|
|
|
|
|
When the value is `open', if the text matched is made invisible by
|
2017-11-10 10:05:08 +00:00
|
|
|
|
an overlay having a non-nil `invisible' property, and that overlay
|
|
|
|
|
has a non-nil property `isearch-open-invisible', then incremental
|
|
|
|
|
search will show the hidden text. (This applies when using `outline.el'
|
|
|
|
|
and `hideshow.el'.)
|
2014-02-20 08:14:20 +00:00
|
|
|
|
|
|
|
|
|
To temporarily change the value for an active incremental search,
|
|
|
|
|
use \\<isearch-mode-map>\\[isearch-toggle-invisible].
|
|
|
|
|
|
|
|
|
|
See also the related option `isearch-hide-immediately'.
|
|
|
|
|
|
2002-11-07 17:46:04 +00:00
|
|
|
|
See also `reveal-mode' if you want overlays to automatically be opened
|
|
|
|
|
whenever point is in one of them."
|
1997-06-13 21:30:38 +00:00
|
|
|
|
:type '(choice (const :tag "Match hidden text" t)
|
|
|
|
|
(const :tag "Open overlays" open)
|
2015-10-24 23:11:37 +00:00
|
|
|
|
(const :tag "Don't match hidden text" nil)))
|
1997-06-13 21:30:38 +00:00
|
|
|
|
|
|
|
|
|
(defcustom isearch-hide-immediately t
|
1997-08-01 04:53:34 +00:00
|
|
|
|
"If non-nil, re-hide an invisible match right away.
|
|
|
|
|
This variable makes a difference when `search-invisible' is set to `open'.
|
2015-11-25 19:09:29 +00:00
|
|
|
|
If non-nil, invisible matches are re-hidden as soon as the match moves
|
|
|
|
|
off the invisible text surrounding the match.
|
2014-02-08 06:56:18 +00:00
|
|
|
|
If nil then do not re-hide opened invisible text when the match moves.
|
|
|
|
|
Whatever the value, all opened invisible text is hidden again after exiting
|
2015-11-25 19:09:29 +00:00
|
|
|
|
the search, with the exception of the last successful match, if any."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'boolean)
|
1997-02-10 09:41:31 +00:00
|
|
|
|
|
2004-09-13 08:18:22 +00:00
|
|
|
|
(defcustom isearch-resume-in-command-history nil
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"If non-nil, `isearch-resume' commands are added to the command history.
|
|
|
|
|
This allows you to resume earlier Isearch sessions through the
|
2004-09-13 08:18:22 +00:00
|
|
|
|
command history."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'boolean)
|
2001-12-02 01:13:55 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-mode-hook nil
|
|
|
|
|
"Function(s) to call after starting up an incremental search.")
|
|
|
|
|
|
2010-05-20 22:16:19 +00:00
|
|
|
|
(defvar isearch-update-post-hook nil
|
|
|
|
|
"Function(s) to call after isearch has found matches in the buffer.")
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-mode-end-hook nil
|
2005-07-16 19:13:30 +00:00
|
|
|
|
"Function(s) to call after terminating an incremental search.
|
|
|
|
|
When these functions are called, `isearch-mode-end-hook-quit'
|
2007-11-10 23:03:24 +00:00
|
|
|
|
is non-nil if the user quits the search.")
|
2005-07-16 19:13:30 +00:00
|
|
|
|
|
|
|
|
|
(defvar isearch-mode-end-hook-quit nil
|
2007-11-10 23:03:24 +00:00
|
|
|
|
"Non-nil while running `isearch-mode-end-hook' if the user quits the search.")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2007-07-23 20:29:10 +00:00
|
|
|
|
(defvar isearch-message-function nil
|
|
|
|
|
"Function to call to display the search prompt.
|
Disambiguate function and variable references in docstrings.
* lisp/comint.el (comint-history-isearch-message): Fix ambiguous doc
string cross-reference(s).
* lisp/ffap.el (ffap-string-at-point-region, ffap-next)
(ffap-string-at-point, ffap-string-around)
(ffap-copy-string-as-kill, ffap-highlight-overlay)
(ffap-literally): Fix ambiguous doc string cross-reference(s).
* lisp/font-lock.el (font-lock-keywords-alist)
(font-lock-removed-keywords-alist): Fix ambiguous doc string
cross-reference(s).
* lisp/help-mode.el (help-xref-symbol-regexp): Add "call" as a hint for
a cross-reference to a function.
* lisp/info.el (Info-find-emacs-command-nodes): Fix ambiguous doc
string cross-reference(s).
* lisp/isearch.el (isearch-message-function, isearch-fail-pos): Fix
ambiguous doc string cross-reference(s).
* lisp/misearch.el (multi-isearch-next-buffer-function): Fix ambiguous
doc string cross-reference(s).
* lisp/newcomment.el (comment-box): Fix ambiguous doc string
cross-reference(s).
* lisp/printing.el (pr-txt-printer-alist, pr-ps-printer-alist)
(pr-setting-database): Fix ambiguous doc string
cross-reference(s).
* lisp/ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces)
(ps-n-up-filling-database): Fix ambiguous doc string
cross-reference(s).
* lisp/server.el (server-buffer, server-log): Fix ambiguous doc string
cross-reference(s).
* lisp/simple.el (newline, delete-backward-char, delete-forward-char)
(minibuffer-history-isearch-message, kill-line, track-eol)
(temporary-goal-column): Fix ambiguous doc string
cross-reference(s).
* lisp/whitespace.el (whitespace-point)
(whitespace-font-lock-refontify, whitespace-bob-marker)
(whitespace-eob-marker): Fix ambiguous doc string
cross-reference(s).
* lisp/calc/calc.el (calc-highlight-selections-with-faces)
(calc-dispatch): Fix ambiguous doc string cross-reference(s).
* lisp/emacs-lisp/edebug.el (edebug-read, edebug-eval-defun): Fix
ambiguous doc string cross-reference(s).
* lisp/gnus/gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
cross-reference(s).
* lisp/gnus/gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string
cross-reference(s).
* lisp/international/mule.el (add-to-coding-system-list): Fix ambiguous
doc string cross-reference(s).
* lisp/progmodes/cc-fonts.el (c-font-lock-keywords-3)
(c++-font-lock-keywords-3, objc-font-lock-keywords-3)
(java-font-lock-keywords-3, idl-font-lock-keywords-3)
(pike-font-lock-keywords-3): Fix ambiguous doc string
cross-reference(s).
* lisp/progmodes/compile.el (compile): Fix ambiguous doc string
cross-reference(s).
* lisp/progmodes/etags.el (tags-table-files)
(tags-table-files-function, tags-included-tables-function): Fix
ambiguous doc string cross-reference(s).
* lisp/progmodes/gdb-mi.el (gdb, gdb-setup-windows)
(gdb-restore-windows): Fix ambiguous doc string
cross-reference(s).
* lisp/textmodes/flyspell.el (flyspell-mark-duplications-flag)
(flyspell-default-deplacement-commands): Fix ambiguous doc string
cross-reference(s).
* lisp/textmodes/ispell.el (ispell-accept-output): Fix ambiguous doc
string cross-reference(s).
* lisp/textmodes/sgml-mode.el (html-tag-help): Fix ambiguous doc string
cross-reference(s).
* lisp/vc/compare-w.el (compare-ignore-whitespace)
(compare-ignore-case, compare-windows-dehighlight): Fix ambiguous
doc string cross-reference(s).
* lisp/vc/diff.el (diff): Fix ambiguous doc string cross-reference(s).
* src/insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix
ambiguous doc string cross-reference(s).
* src/keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous
doc string cross-reference(s).
* src/window.c (Fwindow_point, syms_of_window): Fix ambiguous doc
string cross-reference(s).
Fixes: debbugs:12686
2013-01-11 23:08:55 +00:00
|
|
|
|
If nil, use function `isearch-message'.")
|
2007-07-23 20:29:10 +00:00
|
|
|
|
|
2004-09-01 20:35:12 +00:00
|
|
|
|
(defvar isearch-wrap-function nil
|
|
|
|
|
"Function to call to wrap the search when search is failed.
|
|
|
|
|
If nil, move point to the beginning of the buffer for a forward search,
|
|
|
|
|
or to the end of the buffer for a backward search.")
|
|
|
|
|
|
|
|
|
|
(defvar isearch-push-state-function nil
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Function to save a function restoring the mode-specific Isearch state
|
2004-09-01 20:35:12 +00:00
|
|
|
|
to the search status stack.")
|
|
|
|
|
|
2013-08-05 18:05:46 +00:00
|
|
|
|
(defvar isearch-filter-predicate #'isearch-filter-visible
|
2014-02-08 04:14:16 +00:00
|
|
|
|
"Predicate that filters the search hits that would normally be available.
|
2013-08-05 18:05:46 +00:00
|
|
|
|
Search hits that dissatisfy the predicate are skipped. The function
|
|
|
|
|
has two arguments: the positions of start and end of text matched by
|
|
|
|
|
the search. If this function returns nil, continue searching without
|
|
|
|
|
stopping at this match.
|
|
|
|
|
If you use `add-function' to modify this variable, you can use the
|
|
|
|
|
`isearch-message-prefix' advice property to specify the prefix string
|
|
|
|
|
displayed in the search message.")
|
2008-04-22 19:56:17 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Search ring.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(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.")
|
|
|
|
|
|
1997-05-03 22:35:40 +00:00
|
|
|
|
(defcustom search-ring-max 16
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Maximum length of search ring before oldest elements are thrown away."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'integer)
|
1997-05-03 22:35:40 +00:00
|
|
|
|
(defcustom regexp-search-ring-max 16
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Maximum length of regexp search ring before oldest elements are thrown away."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'integer)
|
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.
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
It is 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.
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
It is nil if none yet.")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1997-05-03 22:35:40 +00:00
|
|
|
|
(defcustom search-ring-update nil
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Non-nil if advancing or retreating in the search ring should cause search.
|
1997-05-03 22:35:40 +00:00
|
|
|
|
Default value, nil, means edit the string instead."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'boolean)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2016-05-17 20:55:38 +00:00
|
|
|
|
(autoload 'char-fold-to-regexp "char-fold")
|
2015-10-25 00:52:01 +00:00
|
|
|
|
|
2016-03-09 23:29:59 +00:00
|
|
|
|
(defcustom search-default-mode nil
|
2015-10-24 23:42:29 +00:00
|
|
|
|
"Default mode to use when starting isearch.
|
|
|
|
|
Value is nil, t, or a function.
|
|
|
|
|
|
|
|
|
|
If nil, default to literal searches (note that `case-fold-search'
|
|
|
|
|
and `isearch-lax-whitespace' may still be applied).\\<isearch-mode-map>
|
|
|
|
|
If t, default to regexp searches (as if typing `\\[isearch-toggle-regexp]' during
|
|
|
|
|
isearch).
|
|
|
|
|
|
|
|
|
|
If a function, use that function as an `isearch-regexp-function'.
|
2016-02-06 18:45:21 +00:00
|
|
|
|
Example functions (and the keys to toggle them during isearch)
|
|
|
|
|
are `word-search-regexp' \(`\\[isearch-toggle-word]'), `isearch-symbol-regexp'
|
2016-05-17 20:55:38 +00:00
|
|
|
|
\(`\\[isearch-toggle-symbol]'), and `char-fold-to-regexp' \(`\\[isearch-toggle-char-fold]')."
|
2015-10-28 11:43:52 +00:00
|
|
|
|
;; :type is set below by `isearch-define-mode-toggle'.
|
2015-10-24 23:42:29 +00:00
|
|
|
|
:type '(choice (const :tag "Literal search" nil)
|
|
|
|
|
(const :tag "Regexp search" t)
|
|
|
|
|
(function :tag "Other"))
|
|
|
|
|
:version "25.1")
|
|
|
|
|
|
2005-01-11 23:03:01 +00:00
|
|
|
|
;;; isearch highlight customization.
|
|
|
|
|
|
|
|
|
|
(defcustom search-highlight t
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Non-nil means incremental search highlights the current match."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:type 'boolean)
|
2005-01-11 23:03:01 +00:00
|
|
|
|
|
|
|
|
|
(defface isearch
|
|
|
|
|
'((((class color) (min-colors 88) (background light))
|
|
|
|
|
;; The background must not be too dark, for that means
|
|
|
|
|
;; the character is hard to see when the cursor is there.
|
2005-07-19 11:39:16 +00:00
|
|
|
|
(:background "magenta3" :foreground "lightskyblue1"))
|
2005-01-11 23:03:01 +00:00
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
|
(:background "palevioletred2" :foreground "brown4"))
|
|
|
|
|
(((class color) (min-colors 16))
|
|
|
|
|
(:background "magenta4" :foreground "cyan1"))
|
|
|
|
|
(((class color) (min-colors 8))
|
|
|
|
|
(:background "magenta4" :foreground "cyan1"))
|
|
|
|
|
(t (:inverse-video t)))
|
|
|
|
|
"Face for highlighting Isearch matches."
|
2005-09-29 22:55:53 +00:00
|
|
|
|
:group 'isearch
|
|
|
|
|
:group 'basic-faces)
|
2010-09-17 22:09:58 +00:00
|
|
|
|
(defvar isearch-face 'isearch)
|
2005-01-11 23:03:01 +00:00
|
|
|
|
|
2008-02-25 00:01:54 +00:00
|
|
|
|
(defface isearch-fail
|
|
|
|
|
'((((class color) (min-colors 88) (background light))
|
|
|
|
|
(:background "RosyBrown1"))
|
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
|
(:background "red4"))
|
|
|
|
|
(((class color) (min-colors 16))
|
|
|
|
|
(:background "red"))
|
|
|
|
|
(((class color) (min-colors 8))
|
|
|
|
|
(:background "red"))
|
|
|
|
|
(((class color grayscale))
|
|
|
|
|
:foreground "grey")
|
|
|
|
|
(t (:inverse-video t)))
|
2008-02-12 00:50:44 +00:00
|
|
|
|
"Face for highlighting failed part in Isearch echo-area message."
|
2015-10-24 23:11:37 +00:00
|
|
|
|
:version "23.1")
|
2008-02-12 00:50:44 +00:00
|
|
|
|
|
2005-01-11 23:03:01 +00:00
|
|
|
|
(defcustom isearch-lazy-highlight t
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Controls the lazy-highlighting during incremental search.
|
2005-01-11 23:03:01 +00:00
|
|
|
|
When non-nil, all text in the buffer matching the current search
|
|
|
|
|
string is highlighted lazily (see `lazy-highlight-initial-delay'
|
2017-02-22 00:10:36 +00:00
|
|
|
|
and `lazy-highlight-interval').
|
|
|
|
|
|
|
|
|
|
When multiple windows display the current buffer, the
|
|
|
|
|
highlighting is displayed only on the selected window, unless
|
|
|
|
|
this variable is set to the symbol `all-windows'."
|
|
|
|
|
:type '(choice boolean
|
|
|
|
|
(const :tag "On, and applied to all windows" all-windows))
|
2005-01-11 23:03:01 +00:00
|
|
|
|
:group 'lazy-highlight
|
|
|
|
|
:group 'isearch)
|
|
|
|
|
|
2005-01-04 02:21:55 +00:00
|
|
|
|
;;; Lazy highlight customization.
|
2005-01-11 23:03:01 +00:00
|
|
|
|
|
2005-01-04 02:21:55 +00:00
|
|
|
|
(defgroup lazy-highlight nil
|
|
|
|
|
"Lazy highlighting feature for matching strings."
|
|
|
|
|
:prefix "lazy-highlight-"
|
|
|
|
|
:version "21.1"
|
|
|
|
|
:group 'isearch
|
2005-01-11 23:03:01 +00:00
|
|
|
|
:group 'matching)
|
2005-01-04 02:21:55 +00:00
|
|
|
|
|
2010-09-23 07:05:22 +00:00
|
|
|
|
(define-obsolete-variable-alias 'isearch-lazy-highlight-cleanup
|
|
|
|
|
'lazy-highlight-cleanup
|
|
|
|
|
"22.1")
|
|
|
|
|
|
2005-01-04 02:21:55 +00:00
|
|
|
|
(defcustom lazy-highlight-cleanup t
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Controls whether to remove extra highlighting after a search.
|
2005-01-04 02:21:55 +00:00
|
|
|
|
If this is nil, extra highlighting can be \"manually\" removed with
|
2005-03-18 07:06:45 +00:00
|
|
|
|
\\[lazy-highlight-cleanup]."
|
2005-01-04 02:21:55 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'lazy-highlight)
|
2010-09-23 07:05:22 +00:00
|
|
|
|
|
|
|
|
|
(define-obsolete-variable-alias 'isearch-lazy-highlight-initial-delay
|
|
|
|
|
'lazy-highlight-initial-delay
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
"22.1")
|
2005-01-04 02:21:55 +00:00
|
|
|
|
|
|
|
|
|
(defcustom lazy-highlight-initial-delay 0.25
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Seconds to wait before beginning to lazily highlight all matches."
|
2005-01-04 02:21:55 +00:00
|
|
|
|
:type 'number
|
|
|
|
|
:group 'lazy-highlight)
|
2010-09-23 07:05:22 +00:00
|
|
|
|
|
|
|
|
|
(define-obsolete-variable-alias 'isearch-lazy-highlight-interval
|
|
|
|
|
'lazy-highlight-interval
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
"22.1")
|
2005-01-04 02:21:55 +00:00
|
|
|
|
|
|
|
|
|
(defcustom lazy-highlight-interval 0 ; 0.0625
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Seconds between lazily highlighting successive matches."
|
2005-01-04 02:21:55 +00:00
|
|
|
|
:type 'number
|
|
|
|
|
:group 'lazy-highlight)
|
2010-09-23 07:05:22 +00:00
|
|
|
|
|
|
|
|
|
(define-obsolete-variable-alias 'isearch-lazy-highlight-max-at-a-time
|
|
|
|
|
'lazy-highlight-max-at-a-time
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
"22.1")
|
2005-01-04 02:21:55 +00:00
|
|
|
|
|
2017-02-21 23:22:18 +00:00
|
|
|
|
(defcustom lazy-highlight-max-at-a-time nil ; 20 (bug#25751)
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Maximum matches to highlight at a time (for `lazy-highlight').
|
|
|
|
|
Larger values may reduce Isearch's responsiveness to user input;
|
2005-01-04 02:21:55 +00:00
|
|
|
|
smaller values make matches highlight slowly.
|
2017-02-22 00:16:06 +00:00
|
|
|
|
A value of nil means highlight all matches shown on the screen."
|
2005-01-04 02:21:55 +00:00
|
|
|
|
:type '(choice (const :tag "All" nil)
|
|
|
|
|
(integer :tag "Some"))
|
|
|
|
|
:group 'lazy-highlight)
|
|
|
|
|
|
2005-01-06 04:44:57 +00:00
|
|
|
|
(defface lazy-highlight
|
2005-01-04 02:21:55 +00:00
|
|
|
|
'((((class color) (min-colors 88) (background light))
|
|
|
|
|
(:background "paleturquoise"))
|
|
|
|
|
(((class color) (min-colors 88) (background dark))
|
|
|
|
|
(:background "paleturquoise4"))
|
|
|
|
|
(((class color) (min-colors 16))
|
|
|
|
|
(:background "turquoise3"))
|
|
|
|
|
(((class color) (min-colors 8))
|
|
|
|
|
(:background "turquoise3"))
|
|
|
|
|
(t (:underline t)))
|
|
|
|
|
"Face for lazy highlighting of matches other than the current one."
|
2005-09-29 22:55:53 +00:00
|
|
|
|
:group 'lazy-highlight
|
|
|
|
|
:group 'basic-faces)
|
Remove some more face aliases obsoleted in 22.1
* lisp/eshell/em-ls.el (eshell-ls-directory-face, eshell-ls-symlink-face,
eshell-ls-executable-face, eshell-ls-readonly-face,
eshell-ls-unreadable-face, eshell-ls-special-face,
eshell-ls-missing-face, eshell-ls-archive-face, eshell-ls-backup-face,
eshell-ls-product-face, eshell-ls-clutter-face): Remove.
* lisp/isearch.el (isearch-lazy-highlight-face, lazy-highlight-face): Remove.
(isearch-lazy-highlight-update): Use face symbol.
* lisp/net/sieve-mode.el (sieve-control-commands-face,
sieve-action-commands-face, sieve-test-commands-face,
sieve-tagged-arguments-face): Remove.
(sieve-font-lock-keywords): Use non-obsolete faces.
* lisp/progmodes/sh-script.el (sh-heredoc-face): Remove.
(sh-get-indent-info, sh-prev-line): Use face symbol.
* lisp/textmodes/tex-mode.el (tex-font-lock-keywords-1):
Use non-obsolete face.
(tex-math-face, tex-verbatim-face): Remove.
(tex-font-lock-syntactic-face-function): Use face symbols.
2016-06-23 22:48:12 +00:00
|
|
|
|
|
2008-04-22 20:32:23 +00:00
|
|
|
|
|
|
|
|
|
;; Define isearch help map.
|
|
|
|
|
|
|
|
|
|
(defvar isearch-help-map
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
(let ((map (make-sparse-keymap)))
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(define-key map (char-to-string help-char) 'isearch-help-for-help)
|
|
|
|
|
(define-key map [help] 'isearch-help-for-help)
|
|
|
|
|
(define-key map [f1] 'isearch-help-for-help)
|
|
|
|
|
(define-key map "?" 'isearch-help-for-help)
|
|
|
|
|
(define-key map "b" 'isearch-describe-bindings)
|
|
|
|
|
(define-key map "k" 'isearch-describe-key)
|
|
|
|
|
(define-key map "m" 'isearch-describe-mode)
|
|
|
|
|
(define-key map "q" 'help-quit)
|
|
|
|
|
map)
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Keymap for characters following the Help key for Isearch mode.")
|
2008-04-22 20:32:23 +00:00
|
|
|
|
|
|
|
|
|
(eval-when-compile (require 'help-macro))
|
|
|
|
|
|
|
|
|
|
(make-help-screen isearch-help-for-help-internal
|
2009-09-27 00:27:21 +00:00
|
|
|
|
(purecopy "Type a help option: [bkm] or ?")
|
2008-04-22 20:32:23 +00:00
|
|
|
|
"You have typed %THIS-KEY%, the help character. Type a Help option:
|
|
|
|
|
\(Type \\<help-map>\\[help-quit] to exit the Help command.)
|
|
|
|
|
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
b Display all Isearch key bindings.
|
|
|
|
|
k KEYS Display full documentation of Isearch key sequence.
|
|
|
|
|
m Display documentation of Isearch mode.
|
2008-04-22 20:32:23 +00:00
|
|
|
|
|
|
|
|
|
You can't type here other help keys available in the global help map,
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
but outside of this help window when you type them in Isearch mode,
|
|
|
|
|
they exit Isearch mode before displaying global help."
|
2008-04-22 20:32:23 +00:00
|
|
|
|
isearch-help-map)
|
|
|
|
|
|
2012-11-04 03:24:00 +00:00
|
|
|
|
(defvar isearch--display-help-action '(nil (inhibit-same-window . t)))
|
|
|
|
|
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(defun isearch-help-for-help ()
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Display Isearch help menu."
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(interactive)
|
2012-11-04 03:24:00 +00:00
|
|
|
|
(let ((display-buffer-overriding-action isearch--display-help-action))
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(isearch-help-for-help-internal))
|
|
|
|
|
(isearch-update))
|
|
|
|
|
|
|
|
|
|
(defun isearch-describe-bindings ()
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Show a list of all keys defined in Isearch mode, and their definitions.
|
|
|
|
|
This is like `describe-bindings', but displays only Isearch keys."
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(interactive)
|
2012-11-04 03:24:00 +00:00
|
|
|
|
(let ((display-buffer-overriding-action isearch--display-help-action))
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(with-help-window "*Help*"
|
|
|
|
|
(with-current-buffer standard-output
|
|
|
|
|
(princ "Isearch Mode Bindings:\n")
|
|
|
|
|
(princ (substitute-command-keys "\\{isearch-mode-map}"))))))
|
|
|
|
|
|
|
|
|
|
(defun isearch-describe-key ()
|
|
|
|
|
"Display documentation of the function invoked by isearch key."
|
|
|
|
|
(interactive)
|
2012-11-04 03:24:00 +00:00
|
|
|
|
(let ((display-buffer-overriding-action isearch--display-help-action))
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(call-interactively 'describe-key))
|
|
|
|
|
(isearch-update))
|
|
|
|
|
|
|
|
|
|
(defun isearch-describe-mode ()
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Display documentation of Isearch mode."
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(interactive)
|
2012-11-04 03:24:00 +00:00
|
|
|
|
(let ((display-buffer-overriding-action isearch--display-help-action))
|
2008-04-22 20:32:23 +00:00
|
|
|
|
(describe-function 'isearch-forward))
|
|
|
|
|
(isearch-update))
|
|
|
|
|
|
|
|
|
|
(defalias 'isearch-mode-help 'isearch-describe-mode)
|
|
|
|
|
|
2005-01-04 02:21:55 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Define isearch-mode keymap.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(defvar isearch-mode-map
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
(let ((i 0)
|
|
|
|
|
(map (make-keymap)))
|
2003-09-08 12:53:41 +00:00
|
|
|
|
(or (char-table-p (nth 1 map))
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(error "The initialization of isearch-mode-map must be updated"))
|
|
|
|
|
;; Make all multibyte characters search for themselves.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(set-char-table-range (nth 1 map) (cons #x100 (max-char))
|
2002-03-01 01:59:51 +00:00
|
|
|
|
'isearch-printing-char)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
|
|
|
|
|
;; Single-byte printing chars extend the search string by default.
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
(setq i ?\s)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(while (< i 256)
|
|
|
|
|
(define-key map (vector i) 'isearch-printing-char)
|
|
|
|
|
(setq i (1+ i)))
|
|
|
|
|
|
|
|
|
|
;; To handle local bindings with meta char prefix keys, define
|
|
|
|
|
;; another full keymap. This must be done for any other prefix
|
|
|
|
|
;; keys as well, one full keymap per char of the prefix key. It
|
|
|
|
|
;; would be simpler to disable the global keymap, and/or have a
|
|
|
|
|
;; default local key binding for any key not otherwise bound.
|
|
|
|
|
(let ((meta-map (make-sparse-keymap)))
|
2013-12-16 20:32:15 +00:00
|
|
|
|
(define-key map (char-to-string meta-prefix-char) meta-map))
|
2000-11-21 21:28:05 +00:00
|
|
|
|
|
|
|
|
|
;; Several non-printing chars change the searching behavior.
|
|
|
|
|
(define-key map "\C-s" 'isearch-repeat-forward)
|
|
|
|
|
(define-key map "\C-r" 'isearch-repeat-backward)
|
|
|
|
|
;; Define M-C-s and M-C-r like C-s and C-r so that the same key
|
|
|
|
|
;; combinations can be used to repeat regexp isearches that can
|
|
|
|
|
;; be used to start these searches.
|
|
|
|
|
(define-key map "\M-\C-s" 'isearch-repeat-forward)
|
|
|
|
|
(define-key map "\M-\C-r" 'isearch-repeat-backward)
|
|
|
|
|
(define-key map "\177" 'isearch-delete-char)
|
2015-05-01 21:11:19 +00:00
|
|
|
|
(define-key map [backspace] 'undefined) ;bug#20466.
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(define-key map "\C-g" 'isearch-abort)
|
2001-01-05 14:41:53 +00:00
|
|
|
|
|
2000-11-21 21:28:05 +00:00
|
|
|
|
;; 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)
|
2003-01-24 17:12:00 +00:00
|
|
|
|
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(define-key map "\C-q" 'isearch-quote-char)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(define-key map "\r" 'isearch-exit)
|
2014-01-07 07:55:50 +00:00
|
|
|
|
(define-key map [return] 'isearch-exit)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(define-key map "\C-j" 'isearch-printing-char)
|
|
|
|
|
(define-key map "\t" 'isearch-printing-char)
|
2004-12-10 01:52:43 +00:00
|
|
|
|
(define-key map [?\S-\ ] 'isearch-printing-char)
|
2003-01-24 17:12:00 +00:00
|
|
|
|
|
2004-07-01 09:54:51 +00:00
|
|
|
|
(define-key map "\C-w" 'isearch-yank-word-or-char)
|
|
|
|
|
(define-key map "\M-\C-w" 'isearch-del-char)
|
|
|
|
|
(define-key map "\M-\C-y" 'isearch-yank-char)
|
2011-03-06 18:24:11 +00:00
|
|
|
|
(define-key map "\C-y" 'isearch-yank-kill)
|
|
|
|
|
(define-key map "\M-s\C-e" 'isearch-yank-line)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2010-05-20 22:01:57 +00:00
|
|
|
|
(define-key map (char-to-string help-char) isearch-help-map)
|
|
|
|
|
(define-key map [help] isearch-help-map)
|
|
|
|
|
(define-key map [f1] isearch-help-map)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(define-key map "\M-n" 'isearch-ring-advance)
|
|
|
|
|
(define-key map "\M-p" 'isearch-ring-retreat)
|
2011-05-03 03:34:26 +00:00
|
|
|
|
(define-key map "\M-y" 'isearch-yank-pop)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
|
|
|
|
|
(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)
|
2001-10-18 10:06:01 +00:00
|
|
|
|
(define-key map [mouse-movement] nil)
|
2005-11-30 22:53:00 +00:00
|
|
|
|
(define-key map [language-change] nil)
|
|
|
|
|
|
2000-11-21 21:28:05 +00:00
|
|
|
|
;; For searching multilingual text.
|
|
|
|
|
(define-key map "\C-\\" 'isearch-toggle-input-method)
|
|
|
|
|
(define-key map "\C-^" 'isearch-toggle-specified-input-method)
|
|
|
|
|
|
|
|
|
|
;; People expect to be able to paste with the mouse.
|
2001-08-31 08:51:39 +00:00
|
|
|
|
(define-key map [mouse-2] #'isearch-mouse-2)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(define-key map [down-mouse-2] nil)
|
2016-05-22 20:38:53 +00:00
|
|
|
|
(define-key map [xterm-paste] #'isearch-xterm-paste)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
|
|
|
|
|
;; Some bindings you may want to put in your isearch-mode-hook.
|
|
|
|
|
;; Suggest some alternates...
|
|
|
|
|
(define-key map "\M-c" 'isearch-toggle-case-fold)
|
|
|
|
|
(define-key map "\M-r" 'isearch-toggle-regexp)
|
|
|
|
|
(define-key map "\M-e" 'isearch-edit-string)
|
|
|
|
|
|
2013-12-19 22:12:12 +00:00
|
|
|
|
(put 'isearch-edit-string :advertised-binding "\M-se")
|
|
|
|
|
|
|
|
|
|
(define-key map "\M-se" 'isearch-edit-string)
|
2015-10-28 11:43:52 +00:00
|
|
|
|
;; More toggles defined by `isearch-define-mode-toggle'.
|
2008-07-30 16:40:48 +00:00
|
|
|
|
|
2004-07-05 23:28:42 +00:00
|
|
|
|
(define-key map [?\M-%] 'isearch-query-replace)
|
|
|
|
|
(define-key map [?\C-\M-%] 'isearch-query-replace-regexp)
|
2007-12-09 23:47:59 +00:00
|
|
|
|
(define-key map "\M-so" 'isearch-occur)
|
2008-06-25 20:22:14 +00:00
|
|
|
|
(define-key map "\M-shr" 'isearch-highlight-regexp)
|
2004-07-01 09:54:51 +00:00
|
|
|
|
|
2013-05-15 23:21:01 +00:00
|
|
|
|
;; The key translations defined in the C-x 8 prefix should add
|
|
|
|
|
;; characters to the search string. See iso-transl.el.
|
|
|
|
|
(define-key map "\C-x8\r" 'isearch-char-by-name)
|
2012-07-18 09:27:23 +00:00
|
|
|
|
|
2000-11-21 21:28:05 +00:00
|
|
|
|
map)
|
|
|
|
|
"Keymap for `isearch-mode'.")
|
|
|
|
|
|
|
|
|
|
(defvar minibuffer-local-isearch-map
|
|
|
|
|
(let ((map (make-sparse-keymap)))
|
|
|
|
|
(set-keymap-parent map minibuffer-local-map)
|
2013-05-15 23:14:18 +00:00
|
|
|
|
(define-key map "\r" 'exit-minibuffer)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(define-key map "\M-\t" 'isearch-complete-edit)
|
2004-07-01 09:54:51 +00:00
|
|
|
|
(define-key map "\C-s" 'isearch-forward-exit-minibuffer)
|
|
|
|
|
(define-key map "\C-r" 'isearch-reverse-exit-minibuffer)
|
|
|
|
|
(define-key map "\C-f" 'isearch-yank-char-in-minibuffer)
|
|
|
|
|
(define-key map [right] 'isearch-yank-char-in-minibuffer)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
map)
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Keymap for editing Isearch strings in the minibuffer.")
|
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.
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(defvar isearch-regexp-function nil
|
2012-05-29 09:46:06 +00:00
|
|
|
|
"Regexp-based search mode for words/symbols.
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
If the value is a function (e.g. `isearch-symbol-regexp'), it is
|
|
|
|
|
called to convert a plain search string to a regexp used by
|
|
|
|
|
regexp search functions.
|
|
|
|
|
The symbol property `isearch-message-prefix' put on this function
|
2016-02-06 18:45:21 +00:00
|
|
|
|
specifies the prefix string displayed in the search message.
|
|
|
|
|
|
|
|
|
|
This variable is set and changed during isearch. To change the
|
2016-08-05 20:31:10 +00:00
|
|
|
|
default behavior used for searches, see `search-default-mode'
|
2016-02-06 18:45:21 +00:00
|
|
|
|
instead.")
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
;; We still support setting this to t for backwards compatibility.
|
|
|
|
|
(define-obsolete-variable-alias 'isearch-word
|
|
|
|
|
'isearch-regexp-function "25.1")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2012-09-02 09:31:45 +00:00
|
|
|
|
(defvar isearch-lax-whitespace t
|
|
|
|
|
"If non-nil, a space will match a sequence of whitespace chars.
|
|
|
|
|
When you enter a space or spaces in ordinary incremental search, it
|
|
|
|
|
will match any sequence matched by the regexp defined by the variable
|
|
|
|
|
`search-whitespace-regexp'. If the value is nil, each space you type
|
|
|
|
|
matches literally, against one space. You can toggle the value of this
|
|
|
|
|
variable by the command `isearch-toggle-lax-whitespace'.")
|
|
|
|
|
|
|
|
|
|
(defvar isearch-regexp-lax-whitespace nil
|
|
|
|
|
"If non-nil, a space will match a sequence of whitespace chars.
|
|
|
|
|
When you enter a space or spaces in regexp incremental search, it
|
|
|
|
|
will match any sequence matched by the regexp defined by the variable
|
|
|
|
|
`search-whitespace-regexp'. If the value is nil, each space you type
|
|
|
|
|
matches literally, against one space. You can toggle the value of this
|
|
|
|
|
variable by the command `isearch-toggle-lax-whitespace'.")
|
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(defvar isearch-cmds nil
|
2014-02-08 04:02:37 +00:00
|
|
|
|
"Stack of search status elements.
|
|
|
|
|
Each element is an `isearch--state' struct where the slots are
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
[STRING MESSAGE POINT SUCCESS FORWARD OTHER-END WORD
|
Deprecate `intangible' and `point-entered' properties
* lisp/emacs-lisp/cursor-sensor.el: New file.
* lisp/simple.el (pre-redisplay-functions): New hook.
(redisplay--pre-redisplay-functions): New function.
(pre-redisplay-function): Use it.
(minibuffer-avoid-prompt): Mark obsolete.
(redisplay--update-region-highlight): Adapt it to work as a function on
pre-redisplay-functions.
* lisp/cus-start.el (minibuffer-prompt-properties--setter): New fun.
(minibuffer-prompt-properties): Use it. Use cursor-intangible rather
than point-entered to make the prompt intangible.
* lisp/forms.el: Move `provide' calls to the end.
(forms-mode): Don't use `run-hooks' on a local var.
(forms--make-format, forms--make-format-elt-using-text-properties):
Use cursor-intangible rather than `intangible'.
(forms-mode): Enable cursor-intangible-mode.
* lisp/isearch.el (isearch-mode): Use defvar-local.
(cursor-sensor-inhibit): Declare.
(isearch-mode): Set cursor-sensor-inhibit.
(isearch-done): Set it back.
(isearch-open-overlay-temporary, isearch-open-necessary-overlays)
(isearch-close-unnecessary-overlays): Don't bother with `intangible'
any more.
* lisp/ses.el (ses-localvars): Remove `mode-line-process'.
(ses-sym-rowcol, ses-cell-value, ses-col-width, ses-col-printer):
Add Edebug spec.
(ses-goto-print, ses-print-cell, ses-adjust-print-width)
(ses-goto-data, ses-setup, ses-copy-region): Don't let-bind
inhibit-point-motion-hooks any more.
(ses--cell-at-pos, ses--curcell): New functions, extracted from
ses-set-curcell.
(ses-set-curcell): Use them.
(ses-print-cell, ses-setup): Use cursor-intangible instead of
`intangible'. Make sure cursor-intangible isn't sticky at BOB.
(ses-print-cell-new-width, ses-reprint-all, ses-recalculate-all):
Use ses--cell-at-pos.
(ses--mode-line-process, ses--cursor-sensor-highlight): New functions,
extracted from ses-command-hook. Make them work with multiple windows
displaying the same buffer.
(ses-mode): Use them via mode-line-process and pre-redisplay-functions.
Enable cursor-intangible-mode.
(ses-command-hook): Remove cell highlight and mode-line update code.
(ses-forward-or-insert, ses-copy-region-helper, ses-sort-column):
Update for new name of text-property holding the cell name.
(ses-rename-cell): Don't mess with mode-line-process.
* lisp/erc/erc-stamp.el (erc-add-timestamp): Use the new
cursor-sensor-functions property instead of point-entered.
(erc-insert-timestamp-right, erc-format-timestamp):
Use cursor-intangible rather than `intangible'.
(erc-munge-invisibility-spec): Use add-to-invisibility-spec and
remove-from-invisibility-spec. Enable cursor-intangible-mode and
cursor-sensor-mode if needed.
(erc-echo-timestamp): Adapt to calling convention of
cursor-sensor-functions.
(erc-insert-timestamp-right): Remove unused vars `current-window' and
`indent'.
* lisp/gnus/gnus-group.el (gnus-tmp-*): Declare.
(gnus-update-group-mark-positions): Remove unused `topic' var.
(gnus-group-insert-group-line): Remove unused var `header'.
(gnus-group--setup-tool-bar-update): New function.
(gnus-group-insert-group-line): Use it.
(gnus-group-update-eval-form): Declare local
dynamically-bound variables.
(gnus-group-unsubscribe-group): Use \` and \' to match string bounds.
* lisp/gnus/gnus-topic.el (gnus-topic-jump-to-topic)
(gnus-group-prepare-topics, gnus-topic-update-topic)
(gnus-topic-change-level, gnus-topic-catchup-articles)
(gnus-topic-remove-group, gnus-topic-delete, gnus-topic-indent):
Use inhibit-read-only.
(gnus-topic-prepare-topic): Use gnus-group--setup-tool-bar-update.
(gnus-topic-mode): Use define-minor-mode and derived-mode-p.
* lisp/textmodes/reftex-index.el (reftex-display-index):
Use cursor-intangible-mode if available.
(reftex-index-post-command-hook): Check cursor-intangible.
* lisp/textmodes/reftex-toc.el (reftex-toc):
Use cursor-intangible-mode if available.
(reftex-toc-recenter, reftex-toc-post-command-hook):
Check cursor-intangible.
* lisp/textmodes/sgml-mode.el: Use lexical-binding.
(sgml-tag): Use cursor-sensor-functions instead of point-entered.
(sgml-tags-invisible): Use with-silent-modifications and
inhibit-read-only. Enable cursor-sensor-mode.
(sgml-cursor-sensor): Rename from sgml-point-entered and adjust to
calling convention of cursor-sensor-functions.
* lisp/textmodes/table.el (table-cell-map-hook, table-load-hook)
(table-point-entered-cell-hook, table-point-left-cell-hook):
Don't autoload.
(table-cell-entered-state): Remove var.
(table--put-cell-point-entered/left-property)
(table--remove-cell-properties):
Use cursor-sensor-functions rather than point-entered/left.
(table--point-entered/left-cell-function): Merge
table--point-entered-cell-function and table--point-left-cell-function
and adjust to calling convention of cursor-sensor-functions.
2015-04-13 19:51:15 +00:00
|
|
|
|
ERROR WRAPPED BARRIER CASE-FOLD-SEARCH]")
|
2002-09-09 21:05:22 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-string "") ; The current search string.
|
|
|
|
|
(defvar isearch-message "") ; text-char-description version of isearch-string
|
|
|
|
|
|
2011-11-15 17:37:37 +00:00
|
|
|
|
(defvar isearch-message-prefix-add nil) ; Additional text for the message prefix
|
|
|
|
|
(defvar isearch-message-suffix-add nil) ; Additional text for the message suffix
|
2008-11-11 20:11:34 +00:00
|
|
|
|
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(defvar isearch-success t) ; Searching is currently successful.
|
|
|
|
|
(defvar isearch-error nil) ; Error message for failed search.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-other-end nil) ; Start (end) of match if forward (backward).
|
|
|
|
|
(defvar isearch-wrapped nil) ; Searching restarted from the top (bottom).
|
2011-07-15 13:33:07 +00:00
|
|
|
|
(defvar isearch-barrier 0
|
|
|
|
|
"Recorded minimum/maximal point for the current search.")
|
1995-12-21 17:49:54 +00:00
|
|
|
|
(defvar isearch-just-started nil)
|
2001-12-16 03:56:40 +00:00
|
|
|
|
(defvar isearch-start-hscroll 0) ; hscroll when starting the search.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2009-02-12 05:38:25 +00:00
|
|
|
|
;; 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.
|
1994-05-03 08:27:40 +00:00
|
|
|
|
(defvar isearch-case-fold-search nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2013-05-30 23:45:41 +00:00
|
|
|
|
;; search-invisible while searching.
|
|
|
|
|
;; either nil, t, or 'open. 'open means the same as t except that
|
|
|
|
|
;; opens hidden overlays.
|
|
|
|
|
(defvar isearch-invisible search-invisible)
|
|
|
|
|
|
2001-10-05 09:24:20 +00:00
|
|
|
|
(defvar isearch-last-case-fold-search nil)
|
|
|
|
|
|
2000-11-22 01:36:08 +00:00
|
|
|
|
;; Used to save default value while isearch is active
|
|
|
|
|
(defvar isearch-original-minibuffer-message-timeout nil)
|
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(defvar isearch-adjusted nil)
|
|
|
|
|
(defvar isearch-slow-terminal-mode nil)
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; If t, using a small window.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-small-window nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(defvar isearch-opoint 0)
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; The window configuration active at the beginning of the search.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-window-configuration 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
|
|
|
|
|
2002-09-09 21:05:22 +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'.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-op-fun nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Is isearch-mode in a recursive edit for modal searching.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-recursive-edit nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Should isearch be terminated after doing one search?
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defvar isearch-nonincremental nil)
|
|
|
|
|
|
2017-02-14 23:28:15 +00:00
|
|
|
|
;; New value of isearch-nonincremental after isearch-edit-string.
|
|
|
|
|
(defvar isearch-new-nonincremental nil)
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; New value of isearch-forward after isearch-edit-string.
|
|
|
|
|
(defvar isearch-new-forward nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1997-06-13 21:30:38 +00:00
|
|
|
|
;; Accumulate here the overlays opened during searching.
|
|
|
|
|
(defvar isearch-opened-overlays nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2012-05-29 09:27:39 +00:00
|
|
|
|
;; Non-nil if the string exists but is invisible.
|
|
|
|
|
(defvar isearch-hidden nil)
|
|
|
|
|
|
1998-07-19 05:17:35 +00:00
|
|
|
|
;; The value of input-method-function when isearch is invoked.
|
|
|
|
|
(defvar isearch-input-method-function nil)
|
|
|
|
|
|
|
|
|
|
;; A flag to tell if input-method-function is locally bound when
|
|
|
|
|
;; isearch is invoked.
|
|
|
|
|
(defvar isearch-input-method-local-p nil)
|
|
|
|
|
|
2013-12-06 00:55:20 +00:00
|
|
|
|
(defvar isearch--saved-overriding-local-map 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))))
|
|
|
|
|
|
Deprecate `intangible' and `point-entered' properties
* lisp/emacs-lisp/cursor-sensor.el: New file.
* lisp/simple.el (pre-redisplay-functions): New hook.
(redisplay--pre-redisplay-functions): New function.
(pre-redisplay-function): Use it.
(minibuffer-avoid-prompt): Mark obsolete.
(redisplay--update-region-highlight): Adapt it to work as a function on
pre-redisplay-functions.
* lisp/cus-start.el (minibuffer-prompt-properties--setter): New fun.
(minibuffer-prompt-properties): Use it. Use cursor-intangible rather
than point-entered to make the prompt intangible.
* lisp/forms.el: Move `provide' calls to the end.
(forms-mode): Don't use `run-hooks' on a local var.
(forms--make-format, forms--make-format-elt-using-text-properties):
Use cursor-intangible rather than `intangible'.
(forms-mode): Enable cursor-intangible-mode.
* lisp/isearch.el (isearch-mode): Use defvar-local.
(cursor-sensor-inhibit): Declare.
(isearch-mode): Set cursor-sensor-inhibit.
(isearch-done): Set it back.
(isearch-open-overlay-temporary, isearch-open-necessary-overlays)
(isearch-close-unnecessary-overlays): Don't bother with `intangible'
any more.
* lisp/ses.el (ses-localvars): Remove `mode-line-process'.
(ses-sym-rowcol, ses-cell-value, ses-col-width, ses-col-printer):
Add Edebug spec.
(ses-goto-print, ses-print-cell, ses-adjust-print-width)
(ses-goto-data, ses-setup, ses-copy-region): Don't let-bind
inhibit-point-motion-hooks any more.
(ses--cell-at-pos, ses--curcell): New functions, extracted from
ses-set-curcell.
(ses-set-curcell): Use them.
(ses-print-cell, ses-setup): Use cursor-intangible instead of
`intangible'. Make sure cursor-intangible isn't sticky at BOB.
(ses-print-cell-new-width, ses-reprint-all, ses-recalculate-all):
Use ses--cell-at-pos.
(ses--mode-line-process, ses--cursor-sensor-highlight): New functions,
extracted from ses-command-hook. Make them work with multiple windows
displaying the same buffer.
(ses-mode): Use them via mode-line-process and pre-redisplay-functions.
Enable cursor-intangible-mode.
(ses-command-hook): Remove cell highlight and mode-line update code.
(ses-forward-or-insert, ses-copy-region-helper, ses-sort-column):
Update for new name of text-property holding the cell name.
(ses-rename-cell): Don't mess with mode-line-process.
* lisp/erc/erc-stamp.el (erc-add-timestamp): Use the new
cursor-sensor-functions property instead of point-entered.
(erc-insert-timestamp-right, erc-format-timestamp):
Use cursor-intangible rather than `intangible'.
(erc-munge-invisibility-spec): Use add-to-invisibility-spec and
remove-from-invisibility-spec. Enable cursor-intangible-mode and
cursor-sensor-mode if needed.
(erc-echo-timestamp): Adapt to calling convention of
cursor-sensor-functions.
(erc-insert-timestamp-right): Remove unused vars `current-window' and
`indent'.
* lisp/gnus/gnus-group.el (gnus-tmp-*): Declare.
(gnus-update-group-mark-positions): Remove unused `topic' var.
(gnus-group-insert-group-line): Remove unused var `header'.
(gnus-group--setup-tool-bar-update): New function.
(gnus-group-insert-group-line): Use it.
(gnus-group-update-eval-form): Declare local
dynamically-bound variables.
(gnus-group-unsubscribe-group): Use \` and \' to match string bounds.
* lisp/gnus/gnus-topic.el (gnus-topic-jump-to-topic)
(gnus-group-prepare-topics, gnus-topic-update-topic)
(gnus-topic-change-level, gnus-topic-catchup-articles)
(gnus-topic-remove-group, gnus-topic-delete, gnus-topic-indent):
Use inhibit-read-only.
(gnus-topic-prepare-topic): Use gnus-group--setup-tool-bar-update.
(gnus-topic-mode): Use define-minor-mode and derived-mode-p.
* lisp/textmodes/reftex-index.el (reftex-display-index):
Use cursor-intangible-mode if available.
(reftex-index-post-command-hook): Check cursor-intangible.
* lisp/textmodes/reftex-toc.el (reftex-toc):
Use cursor-intangible-mode if available.
(reftex-toc-recenter, reftex-toc-post-command-hook):
Check cursor-intangible.
* lisp/textmodes/sgml-mode.el: Use lexical-binding.
(sgml-tag): Use cursor-sensor-functions instead of point-entered.
(sgml-tags-invisible): Use with-silent-modifications and
inhibit-read-only. Enable cursor-sensor-mode.
(sgml-cursor-sensor): Rename from sgml-point-entered and adjust to
calling convention of cursor-sensor-functions.
* lisp/textmodes/table.el (table-cell-map-hook, table-load-hook)
(table-point-entered-cell-hook, table-point-left-cell-hook):
Don't autoload.
(table-cell-entered-state): Remove var.
(table--put-cell-point-entered/left-property)
(table--remove-cell-properties):
Use cursor-sensor-functions rather than point-entered/left.
(table--point-entered/left-cell-function): Merge
table--point-entered-cell-function and table--point-left-cell-function
and adjust to calling convention of cursor-sensor-functions.
2015-04-13 19:51:15 +00:00
|
|
|
|
(defvar-local isearch-mode nil) ;; Name of the minor mode, if non-nil.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
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)
|
2008-07-30 16:40:48 +00:00
|
|
|
|
(define-key search-map "w" 'isearch-forward-word)
|
2012-05-29 09:46:06 +00:00
|
|
|
|
(define-key search-map "_" 'isearch-forward-symbol)
|
2013-06-03 08:51:50 +00:00
|
|
|
|
(define-key search-map "." 'isearch-forward-symbol-at-point)
|
1992-09-14 22:50:18 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Entry points to isearch-mode.
|
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.
|
2003-01-24 17:12:00 +00:00
|
|
|
|
The following non-printing keys are bound in `isearch-mode-map'.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2004-04-29 15:28:55 +00:00
|
|
|
|
Type \\[isearch-delete-char] to cancel last input item 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.
|
2006-01-19 17:50:42 +00:00
|
|
|
|
Type \\[isearch-yank-word-or-char] to yank next word or character in buffer
|
|
|
|
|
onto the end of the search string, and search for it.
|
2004-07-01 09:54:51 +00:00
|
|
|
|
Type \\[isearch-del-char] to delete character from end of search string.
|
|
|
|
|
Type \\[isearch-yank-char] to yank char from buffer onto end of search\
|
1992-09-14 22:31:47 +00:00
|
|
|
|
string and search for it.
|
|
|
|
|
Type \\[isearch-yank-line] to yank rest of line onto end of search string\
|
|
|
|
|
and search for it.
|
2007-04-06 18:27:43 +00:00
|
|
|
|
Type \\[isearch-yank-kill] to yank the last string of killed text.
|
2011-05-03 03:34:26 +00:00
|
|
|
|
Type \\[isearch-yank-pop] to replace string just yanked into search prompt
|
|
|
|
|
with string killed before it.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
Type \\[isearch-quote-char] to quote control character to search for it.
|
2013-05-15 23:21:01 +00:00
|
|
|
|
Type \\[isearch-char-by-name] to add a character to search by Unicode name,\
|
|
|
|
|
with completion.
|
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
|
|
|
|
|
2005-09-26 00:02:37 +00:00
|
|
|
|
If you try to exit with the search string still empty, it invokes
|
|
|
|
|
nonincremental search.
|
|
|
|
|
|
2001-01-19 17:13:17 +00:00
|
|
|
|
Type \\[isearch-toggle-case-fold] to toggle search case-sensitivity.
|
2013-05-30 23:45:41 +00:00
|
|
|
|
Type \\[isearch-toggle-invisible] to toggle search in invisible text.
|
2001-01-19 17:13:17 +00:00
|
|
|
|
Type \\[isearch-toggle-regexp] to toggle regular-expression mode.
|
2008-07-30 16:40:48 +00:00
|
|
|
|
Type \\[isearch-toggle-word] to toggle word mode.
|
2012-05-29 09:46:06 +00:00
|
|
|
|
Type \\[isearch-toggle-symbol] to toggle symbol mode.
|
2016-05-17 20:55:38 +00:00
|
|
|
|
Type \\[isearch-toggle-char-fold] to toggle character folding.
|
2012-09-02 09:31:45 +00:00
|
|
|
|
|
|
|
|
|
Type \\[isearch-toggle-lax-whitespace] to toggle whitespace matching.
|
|
|
|
|
In incremental searches, a space or spaces normally matches any whitespace
|
|
|
|
|
defined by the variable `search-whitespace-regexp'; see also the variables
|
|
|
|
|
`isearch-lax-whitespace' and `isearch-regexp-lax-whitespace'.
|
|
|
|
|
|
2001-01-19 17:13:17 +00:00
|
|
|
|
Type \\[isearch-edit-string] to edit the search string in the minibuffer.
|
|
|
|
|
|
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
|
|
|
|
|
2008-07-30 16:40:48 +00:00
|
|
|
|
Type \\[isearch-query-replace] to run `query-replace' with string to\
|
|
|
|
|
replace from last search string.
|
|
|
|
|
Type \\[isearch-query-replace-regexp] to run `query-replace-regexp'\
|
|
|
|
|
with the last search string.
|
|
|
|
|
Type \\[isearch-occur] to run `occur' that shows\
|
|
|
|
|
the last search string.
|
|
|
|
|
Type \\[isearch-highlight-regexp] to run `highlight-regexp'\
|
|
|
|
|
that highlights the last search string.
|
|
|
|
|
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
Type \\[isearch-describe-bindings] to display all Isearch key bindings.
|
|
|
|
|
Type \\[isearch-describe-key] to display documentation of Isearch key.
|
|
|
|
|
Type \\[isearch-describe-mode] to display documentation of Isearch mode.
|
2008-04-22 20:32:23 +00:00
|
|
|
|
|
2001-02-05 17:15:07 +00:00
|
|
|
|
If an input method is turned on in the current buffer, that input
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
method is also active while you are typing characters to search.
|
|
|
|
|
To toggle the input method, type \\[isearch-toggle-input-method]. \
|
|
|
|
|
It also toggles the input
|
|
|
|
|
method in the current buffer.
|
2001-02-05 00:39:48 +00:00
|
|
|
|
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
To use a different input method for searching, type \
|
|
|
|
|
\\[isearch-toggle-specified-input-method],
|
|
|
|
|
and specify an input method you want to use.
|
2001-02-05 00:39:48 +00:00
|
|
|
|
|
2003-01-24 17:12:00 +00:00
|
|
|
|
The above keys, bound in `isearch-mode-map', are often controlled by
|
2004-04-29 15:28:55 +00:00
|
|
|
|
options; do \\[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').
|
1995-10-04 16:00:11 +00:00
|
|
|
|
Likewise for function keys and mouse button events.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2013-05-01 08:10:12 +00:00
|
|
|
|
If this function is called non-interactively with a nil NO-RECURSIVE-EDIT,
|
|
|
|
|
it does not return to the calling function until the search is done.
|
|
|
|
|
See the function `isearch-mode' for more information."
|
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)
|
2012-08-26 03:57:55 +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.
|
2008-07-31 17:19:28 +00:00
|
|
|
|
Like ordinary incremental search except that your input is treated
|
|
|
|
|
as a regexp. See the command `isearch-forward' for more information.
|
2004-12-03 00:30:33 +00:00
|
|
|
|
|
2012-08-26 03:57:55 +00:00
|
|
|
|
In incremental searches, a space or spaces normally matches any
|
2012-09-02 09:31:45 +00:00
|
|
|
|
whitespace defined by the variable `search-whitespace-regexp'.
|
|
|
|
|
To search for a literal space and nothing else, enter C-q SPC.
|
2015-11-30 17:30:29 +00:00
|
|
|
|
To toggle whitespace matching, use `isearch-toggle-lax-whitespace'.
|
|
|
|
|
This command does not support character folding."
|
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
|
|
|
|
|
2008-07-30 16:40:48 +00:00
|
|
|
|
(defun isearch-forward-word (&optional not-word no-recursive-edit)
|
2012-08-26 03:57:55 +00:00
|
|
|
|
"Do incremental search forward for a sequence of words.
|
2008-07-30 16:40:48 +00:00
|
|
|
|
With a prefix argument, do a regular string search instead.
|
2008-07-31 17:19:28 +00:00
|
|
|
|
Like ordinary incremental search except that your input is treated
|
|
|
|
|
as a sequence of words without regard to how the words are separated.
|
2015-11-30 17:30:29 +00:00
|
|
|
|
See the command `isearch-forward' for more information.
|
2015-12-01 19:29:14 +00:00
|
|
|
|
This command does not support character folding, and lax space matching
|
|
|
|
|
has no effect on it."
|
2008-07-30 16:40:48 +00:00
|
|
|
|
(interactive "P\np")
|
|
|
|
|
(isearch-mode t nil nil (not no-recursive-edit) (null not-word)))
|
|
|
|
|
|
2013-08-08 23:59:14 +00:00
|
|
|
|
(defun isearch-forward-symbol (&optional _not-symbol no-recursive-edit)
|
2012-08-26 03:57:55 +00:00
|
|
|
|
"Do incremental search forward for a symbol.
|
2012-05-29 09:46:06 +00:00
|
|
|
|
The prefix argument is currently unused.
|
|
|
|
|
Like ordinary incremental search except that your input is treated
|
|
|
|
|
as a symbol surrounded by symbol boundary constructs \\_< and \\_>.
|
2015-11-30 17:30:29 +00:00
|
|
|
|
See the command `isearch-forward' for more information.
|
2015-12-01 19:29:14 +00:00
|
|
|
|
This command does not support character folding, and lax space matching
|
|
|
|
|
has no effect on it."
|
2012-05-29 09:46:06 +00:00
|
|
|
|
(interactive "P\np")
|
|
|
|
|
(isearch-mode t nil nil (not no-recursive-edit) 'isearch-symbol-regexp))
|
|
|
|
|
|
1993-02-17 20:34:20 +00:00
|
|
|
|
(defun isearch-backward (&optional regexp-p no-recursive-edit)
|
2012-08-26 03:57:55 +00:00
|
|
|
|
"Do incremental search backward.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
With a prefix argument, do a regular expression search instead.
|
2008-07-31 17:19:28 +00:00
|
|
|
|
See the command `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)
|
2012-08-26 03:57:55 +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.
|
2008-07-31 17:19:28 +00:00
|
|
|
|
Like ordinary incremental search except that your input is treated
|
2015-11-30 17:30:29 +00:00
|
|
|
|
as a regexp. See the command `isearch-forward-regexp' 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 (null not-regexp) nil (not no-recursive-edit)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2013-06-03 08:51:50 +00:00
|
|
|
|
(defun isearch-forward-symbol-at-point ()
|
|
|
|
|
"Do incremental search forward for a symbol found near point.
|
|
|
|
|
Like ordinary incremental search except that the symbol found at point
|
|
|
|
|
is added to the search string initially as a regexp surrounded
|
|
|
|
|
by symbol boundary constructs \\_< and \\_>.
|
|
|
|
|
See the command `isearch-forward-symbol' for more information."
|
|
|
|
|
(interactive)
|
|
|
|
|
(isearch-forward-symbol nil 1)
|
|
|
|
|
(let ((bounds (find-tag-default-bounds)))
|
|
|
|
|
(cond
|
|
|
|
|
(bounds
|
|
|
|
|
(when (< (car bounds) (point))
|
|
|
|
|
(goto-char (car bounds)))
|
|
|
|
|
(isearch-yank-string
|
|
|
|
|
(buffer-substring-no-properties (car bounds) (cdr bounds))))
|
|
|
|
|
(t
|
|
|
|
|
(setq isearch-error "No symbol at point")
|
2016-05-01 20:30:51 +00:00
|
|
|
|
(isearch-push-state)
|
2013-06-03 08:51:50 +00:00
|
|
|
|
(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:
|
1996-12-16 01:33:02 +00:00
|
|
|
|
;;(defvar isearch-commands '(isearch-forward isearch-backward
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; isearch-forward-regexp isearch-backward-regexp)
|
|
|
|
|
;; "List of commands for which isearch-mode does not recursive-edit.")
|
2003-01-24 17:12:00 +00:00
|
|
|
|
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(defun isearch-mode (forward &optional regexp op-fun recursive-edit regexp-function)
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Start Isearch minor mode.
|
2013-05-01 08:10:12 +00:00
|
|
|
|
It is called by the function `isearch-forward' and other related functions.
|
|
|
|
|
|
|
|
|
|
The non-nil arg FORWARD means searching in the forward direction.
|
|
|
|
|
|
|
|
|
|
The non-nil arg REGEXP does an incremental regular expression search.
|
|
|
|
|
|
|
|
|
|
The arg OP-FUN is a function to be called after each input character
|
|
|
|
|
is processed. (It is not called after characters that exit the search.)
|
|
|
|
|
|
|
|
|
|
When the arg RECURSIVE-EDIT is non-nil, this function behaves modally and
|
|
|
|
|
does not return to the calling function until the search is completed.
|
|
|
|
|
To behave this way it enters a recursive-edit and exits it when done
|
|
|
|
|
isearching.
|
|
|
|
|
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
The arg REGEXP-FUNCTION, if non-nil, should be a function. It is
|
|
|
|
|
used to set the value of `isearch-regexp-function'."
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
;; Initialize global vars.
|
|
|
|
|
(setq isearch-forward forward
|
2015-10-24 23:42:29 +00:00
|
|
|
|
isearch-regexp (or regexp
|
|
|
|
|
(and (not regexp-function)
|
2016-02-06 18:44:22 +00:00
|
|
|
|
(eq search-default-mode t)))
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
isearch-regexp-function (or regexp-function
|
2016-02-06 18:44:22 +00:00
|
|
|
|
(and (functionp search-default-mode)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(not regexp)
|
2016-02-06 18:44:22 +00:00
|
|
|
|
search-default-mode))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
isearch-op-fun op-fun
|
2001-10-05 09:24:20 +00:00
|
|
|
|
isearch-last-case-fold-search isearch-case-fold-search
|
1992-06-24 05:05:16 +00:00
|
|
|
|
isearch-case-fold-search case-fold-search
|
2013-05-30 23:45:41 +00:00
|
|
|
|
isearch-invisible search-invisible
|
1992-06-24 05:05:16 +00:00
|
|
|
|
isearch-string ""
|
|
|
|
|
isearch-message ""
|
|
|
|
|
isearch-cmds nil
|
|
|
|
|
isearch-success t
|
|
|
|
|
isearch-wrapped nil
|
|
|
|
|
isearch-barrier (point)
|
|
|
|
|
isearch-adjusted nil
|
|
|
|
|
isearch-yank-flag nil
|
2005-03-15 10:45:25 +00:00
|
|
|
|
isearch-error nil
|
1994-11-15 19:41:36 +00:00
|
|
|
|
isearch-slow-terminal-mode (and (<= baud-rate search-slow-speed)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(> (window-height)
|
2001-11-13 16:39:40 +00:00
|
|
|
|
(* 4
|
|
|
|
|
(abs search-slow-window-lines))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
isearch-other-end nil
|
|
|
|
|
isearch-small-window nil
|
1995-12-21 17:49:54 +00:00
|
|
|
|
isearch-just-started t
|
2001-12-16 03:56:40 +00:00
|
|
|
|
isearch-start-hscroll (window-hscroll)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
isearch-opoint (point)
|
1992-09-15 10:00:34 +00:00
|
|
|
|
search-ring-yank-pointer nil
|
1997-06-13 21:30:38 +00:00
|
|
|
|
isearch-opened-overlays nil
|
1998-07-19 05:17:35 +00:00
|
|
|
|
isearch-input-method-function input-method-function
|
|
|
|
|
isearch-input-method-local-p (local-variable-p 'input-method-function)
|
2000-11-22 01:36:08 +00:00
|
|
|
|
regexp-search-ring-yank-pointer nil
|
|
|
|
|
|
|
|
|
|
;; Save the original value of `minibuffer-message-timeout', and
|
|
|
|
|
;; set it to nil so that isearch's messages don't get timed out.
|
|
|
|
|
isearch-original-minibuffer-message-timeout minibuffer-message-timeout
|
|
|
|
|
minibuffer-message-timeout nil)
|
1998-07-19 05:17:35 +00:00
|
|
|
|
|
|
|
|
|
;; We must bypass input method while reading key. When a user type
|
|
|
|
|
;; printable character, appropriate input method is turned on in
|
2001-01-06 19:04:32 +00:00
|
|
|
|
;; minibuffer to read multibyte characters.
|
1998-07-19 05:17:35 +00:00
|
|
|
|
(or isearch-input-method-local-p
|
|
|
|
|
(make-local-variable 'input-method-function))
|
|
|
|
|
(setq input-method-function nil)
|
|
|
|
|
|
1995-12-21 17:49:54 +00:00
|
|
|
|
(looking-at "")
|
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
|
|
|
|
|
1996-12-07 20:31:38 +00:00
|
|
|
|
;; Maybe make minibuffer frame visible and/or raise it.
|
|
|
|
|
(let ((frame (window-frame (minibuffer-window))))
|
2002-04-10 14:47:27 +00:00
|
|
|
|
(unless (memq (frame-live-p frame) '(nil t))
|
|
|
|
|
(unless (frame-visible-p frame)
|
|
|
|
|
(make-frame-visible frame))
|
|
|
|
|
(if minibuffer-auto-raise
|
|
|
|
|
(raise-frame frame))))
|
1996-12-07 20:31:38 +00:00
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(setq isearch-mode " Isearch") ;; forward? regexp?
|
1995-04-25 22:28:40 +00:00
|
|
|
|
(force-mode-line-update)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1995-06-16 06:10:21 +00:00
|
|
|
|
(setq overriding-terminal-local-map isearch-mode-map)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(run-hooks 'isearch-mode-hook)
|
2013-12-06 00:55:20 +00:00
|
|
|
|
;; Remember the initial map possibly modified
|
|
|
|
|
;; by external packages in isearch-mode-hook. (Bug#16035)
|
|
|
|
|
(setq isearch--saved-overriding-local-map overriding-terminal-local-map)
|
2009-12-07 17:30:01 +00:00
|
|
|
|
|
|
|
|
|
;; Pushing the initial state used to be before running isearch-mode-hook,
|
|
|
|
|
;; but a hook might set `isearch-push-state-function' used in
|
|
|
|
|
;; `isearch-push-state' to save mode-specific initial state. (Bug#4994)
|
|
|
|
|
(isearch-push-state)
|
|
|
|
|
|
2008-11-22 20:40:44 +00:00
|
|
|
|
(isearch-update)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2013-12-04 00:12:02 +00:00
|
|
|
|
(add-hook 'pre-command-hook 'isearch-pre-command-hook)
|
|
|
|
|
(add-hook 'post-command-hook 'isearch-post-command-hook)
|
1996-04-04 16:38:59 +00:00
|
|
|
|
(add-hook 'mouse-leave-buffer-hook 'isearch-done)
|
2001-01-08 12:26:23 +00:00
|
|
|
|
(add-hook 'kbd-macro-termination-hook 'isearch-done)
|
1994-12-26 05:09:07 +00:00
|
|
|
|
|
2003-01-24 17:12:00 +00:00
|
|
|
|
;; isearch-mode can be made modal (in the sense of not returning to
|
|
|
|
|
;; the calling function until searching is completed) by entering
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; 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)))
|
1994-08-30 07:03:33 +00:00
|
|
|
|
isearch-success)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Some high level utilities. Others below.
|
2015-05-28 02:43:08 +00:00
|
|
|
|
(defvar isearch--current-buffer nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-update ()
|
2012-02-04 02:10:22 +00:00
|
|
|
|
"This is called after every isearch command to update the display.
|
2015-12-07 15:12:15 +00:00
|
|
|
|
The second last thing it does is to run `isearch-update-post-hook'.
|
|
|
|
|
The last thing is to trigger a new round of lazy highlighting."
|
2015-05-28 02:42:33 +00:00
|
|
|
|
(unless (eq (current-buffer) isearch--current-buffer)
|
2015-10-30 11:04:50 +00:00
|
|
|
|
(when (buffer-live-p isearch--current-buffer)
|
2015-05-28 02:42:33 +00:00
|
|
|
|
(with-current-buffer isearch--current-buffer
|
|
|
|
|
(setq cursor-sensor-inhibit (delq 'isearch cursor-sensor-inhibit))))
|
|
|
|
|
(setq isearch--current-buffer (current-buffer))
|
|
|
|
|
(make-local-variable 'cursor-sensor-inhibit)
|
|
|
|
|
;; Suspend things like cursor-intangible during Isearch so we can search
|
|
|
|
|
;; even within intangible text.
|
|
|
|
|
(push 'isearch cursor-sensor-inhibit))
|
|
|
|
|
|
2002-02-06 15:25:15 +00:00
|
|
|
|
(if (and (null unread-command-events)
|
|
|
|
|
(null executing-kbd-macro))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(progn
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(if (not (input-pending-p))
|
2015-11-18 21:14:30 +00:00
|
|
|
|
(funcall (or isearch-message-function #'isearch-message)))
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(if (and isearch-slow-terminal-mode
|
2003-01-24 17:12:00 +00:00
|
|
|
|
(not (or isearch-small-window
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(pos-visible-in-window-group-p))))
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(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))
|
2001-12-16 03:56:40 +00:00
|
|
|
|
(goto-char found-point))
|
|
|
|
|
;; Keep same hscrolling as at the start of the search when possible
|
2014-11-24 13:32:14 +00:00
|
|
|
|
(let ((current-scroll (window-hscroll))
|
|
|
|
|
visible-p)
|
2001-12-16 03:56:40 +00:00
|
|
|
|
(set-window-hscroll (selected-window) isearch-start-hscroll)
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(setq visible-p (pos-visible-in-window-group-p nil nil t))
|
2014-11-24 13:32:14 +00:00
|
|
|
|
(if (or (not visible-p)
|
|
|
|
|
;; When point is not visible because of hscroll,
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
;; pos-visible-in-window-group-p returns non-nil, but
|
2014-11-24 13:32:14 +00:00
|
|
|
|
;; the X coordinate it returns is 1 pixel beyond
|
|
|
|
|
;; the last visible one.
|
2016-10-08 09:35:17 +00:00
|
|
|
|
(>= (car visible-p)
|
|
|
|
|
(* (window-max-chars-per-line) (frame-char-width))))
|
2014-11-24 13:32:14 +00:00
|
|
|
|
(set-window-hscroll (selected-window) current-scroll))))
|
2001-12-16 03:56:40 +00:00
|
|
|
|
(if isearch-other-end
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(if (< isearch-other-end (point)) ; isearch-forward?
|
|
|
|
|
(isearch-highlight isearch-other-end (point))
|
|
|
|
|
(isearch-highlight (point) isearch-other-end))
|
2012-08-26 03:57:55 +00:00
|
|
|
|
(isearch-dehighlight))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(setq ;; quit-flag nil not for isearch-mode
|
|
|
|
|
isearch-adjusted nil
|
|
|
|
|
isearch-yank-flag nil)
|
2000-06-01 06:22:31 +00:00
|
|
|
|
;; We must prevent the point moving to the end of composition when a
|
|
|
|
|
;; part of the composition has just been searched.
|
2010-05-20 22:16:19 +00:00
|
|
|
|
(setq disable-point-adjustment t)
|
2015-12-07 15:12:15 +00:00
|
|
|
|
(run-hooks 'isearch-update-post-hook)
|
|
|
|
|
(when isearch-lazy-highlight
|
|
|
|
|
(isearch-lazy-highlight-new-loop)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1994-08-30 07:03:33 +00:00
|
|
|
|
(defun isearch-done (&optional nopush edit)
|
2005-07-16 19:13:30 +00:00
|
|
|
|
"Exit Isearch mode.
|
|
|
|
|
For successful search, pass no args.
|
|
|
|
|
For a failing search, NOPUSH is t.
|
|
|
|
|
For going to the minibuffer to edit the search string,
|
|
|
|
|
NOPUSH is t and EDIT is t."
|
|
|
|
|
|
2004-09-13 08:18:22 +00:00
|
|
|
|
(if isearch-resume-in-command-history
|
2001-12-02 01:13:55 +00:00
|
|
|
|
(let ((command `(isearch-resume ,isearch-string ,isearch-regexp
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
,isearch-regexp-function ,isearch-forward
|
2001-12-02 01:13:55 +00:00
|
|
|
|
,isearch-message
|
|
|
|
|
',isearch-case-fold-search)))
|
|
|
|
|
(unless (equal (car command-history) command)
|
|
|
|
|
(setq command-history (cons command command-history)))))
|
2000-07-26 14:48:00 +00:00
|
|
|
|
|
2013-12-04 00:12:02 +00:00
|
|
|
|
(remove-hook 'pre-command-hook 'isearch-pre-command-hook)
|
|
|
|
|
(remove-hook 'post-command-hook 'isearch-post-command-hook)
|
1996-04-04 16:38:59 +00:00
|
|
|
|
(remove-hook 'mouse-leave-buffer-hook 'isearch-done)
|
2001-01-08 12:26:23 +00:00
|
|
|
|
(remove-hook 'kbd-macro-termination-hook 'isearch-done)
|
2001-01-10 17:20:35 +00:00
|
|
|
|
(setq isearch-lazy-highlight-start nil)
|
2016-09-04 03:38:35 +00:00
|
|
|
|
(when (buffer-live-p isearch--current-buffer)
|
|
|
|
|
(with-current-buffer isearch--current-buffer
|
|
|
|
|
(setq isearch--current-buffer nil)
|
|
|
|
|
(setq cursor-sensor-inhibit (delq 'isearch cursor-sensor-inhibit))))
|
2001-01-10 17:20:35 +00:00
|
|
|
|
|
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.
|
1995-06-16 06:10:21 +00:00
|
|
|
|
(setq overriding-terminal-local-map nil)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; (setq pre-command-hook isearch-old-pre-command-hook) ; for lemacs
|
2000-11-22 01:36:08 +00:00
|
|
|
|
(setq minibuffer-message-timeout isearch-original-minibuffer-message-timeout)
|
2005-01-05 20:49:11 +00:00
|
|
|
|
(isearch-dehighlight)
|
2005-03-18 07:06:45 +00:00
|
|
|
|
(lazy-highlight-cleanup lazy-highlight-cleanup)
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(let ((found-start (window-group-start))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(found-point (point)))
|
2007-01-01 21:49:04 +00:00
|
|
|
|
(when isearch-window-configuration
|
|
|
|
|
(set-window-configuration isearch-window-configuration)
|
|
|
|
|
(if isearch-small-window
|
|
|
|
|
(goto-char found-point)
|
|
|
|
|
;; set-window-configuration clobbers window-start; restore it.
|
|
|
|
|
;; This has an annoying side effect of clearing the last_modiff
|
|
|
|
|
;; field of the window, which can cause unwanted scrolling,
|
|
|
|
|
;; so don't do it unless truly necessary.
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(set-window-group-start (selected-window) found-start t))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
(setq isearch-mode nil)
|
1998-07-19 05:17:35 +00:00
|
|
|
|
(if isearch-input-method-local-p
|
|
|
|
|
(setq input-method-function isearch-input-method-function)
|
|
|
|
|
(kill-local-variable 'input-method-function))
|
|
|
|
|
|
1995-04-25 22:28:40 +00:00
|
|
|
|
(force-mode-line-update)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1999-07-02 12:53:04 +00:00
|
|
|
|
;; If we ended in the middle of some intangible text,
|
|
|
|
|
;; move to the further end of that intangible text.
|
|
|
|
|
(let ((after (if (eobp) nil
|
|
|
|
|
(get-text-property (point) 'intangible)))
|
|
|
|
|
(before (if (bobp) nil
|
|
|
|
|
(get-text-property (1- (point)) 'intangible))))
|
|
|
|
|
(when (and before after (eq before after))
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(goto-char
|
|
|
|
|
(if isearch-forward
|
|
|
|
|
(next-single-property-change (point) 'intangible)
|
|
|
|
|
(previous-single-property-change (point) 'intangible)))))
|
1999-07-02 12:53:04 +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.
|
1995-03-23 02:25:55 +00:00
|
|
|
|
(isearch-update-ring isearch-string isearch-regexp))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2005-07-16 19:13:30 +00:00
|
|
|
|
(let ((isearch-mode-end-hook-quit (and nopush (not edit))))
|
|
|
|
|
(run-hooks 'isearch-mode-end-hook))
|
2004-10-05 04:22:41 +00:00
|
|
|
|
|
|
|
|
|
;; If there was movement, mark the starting position.
|
2007-08-08 07:40:09 +00:00
|
|
|
|
;; Maybe should test difference between and set mark only if > threshold.
|
2004-10-05 04:22:41 +00:00
|
|
|
|
(if (/= (point) isearch-opoint)
|
|
|
|
|
(or (and transient-mark-mode mark-active)
|
|
|
|
|
(progn
|
|
|
|
|
(push-mark isearch-opoint t)
|
2011-08-29 20:22:44 +00:00
|
|
|
|
(or executing-kbd-macro (> (minibuffer-depth) 0) edit
|
2004-10-05 04:22:41 +00:00
|
|
|
|
(message "Mark saved where search started")))))
|
|
|
|
|
|
1994-08-30 07:03:33 +00:00
|
|
|
|
(and (not edit) isearch-recursive-edit (exit-recursive-edit)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1995-03-23 02:25:55 +00:00
|
|
|
|
(defun isearch-update-ring (string &optional regexp)
|
|
|
|
|
"Add STRING to the beginning of the search ring.
|
2006-05-03 23:27:53 +00:00
|
|
|
|
REGEXP if non-nil says use the regexp search ring."
|
2006-05-05 23:37:31 +00:00
|
|
|
|
(add-to-history
|
|
|
|
|
(if regexp 'regexp-search-ring 'search-ring)
|
|
|
|
|
string
|
|
|
|
|
(if regexp regexp-search-ring-max search-ring-max)))
|
1995-03-23 02:25:55 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Switching buffers should first terminate isearch-mode.
|
|
|
|
|
;; ;; 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)
|
2009-01-09 04:44:15 +00:00
|
|
|
|
;; (handle-switch-frame (car (cdr last-command-event))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
|
|
|
|
|
;; The search status structure and stack.
|
|
|
|
|
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(cl-defstruct (isearch--state
|
|
|
|
|
(:constructor nil)
|
|
|
|
|
(:copier nil)
|
|
|
|
|
(:constructor isearch--get-state
|
|
|
|
|
(&aux
|
|
|
|
|
(string isearch-string)
|
|
|
|
|
(message isearch-message)
|
|
|
|
|
(point (point))
|
|
|
|
|
(success isearch-success)
|
|
|
|
|
(forward isearch-forward)
|
|
|
|
|
(other-end isearch-other-end)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(word isearch-regexp-function)
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(error isearch-error)
|
|
|
|
|
(wrapped isearch-wrapped)
|
|
|
|
|
(barrier isearch-barrier)
|
|
|
|
|
(case-fold-search isearch-case-fold-search)
|
|
|
|
|
(pop-fun (if isearch-push-state-function
|
|
|
|
|
(funcall isearch-push-state-function))))))
|
2016-10-18 20:07:59 +00:00
|
|
|
|
(string nil :read-only t)
|
|
|
|
|
(message nil :read-only t)
|
|
|
|
|
(point nil :read-only t)
|
|
|
|
|
(success nil :read-only t)
|
|
|
|
|
(forward nil :read-only t)
|
|
|
|
|
(other-end nil :read-only t)
|
|
|
|
|
(word nil :read-only t)
|
|
|
|
|
(error nil :read-only t)
|
|
|
|
|
(wrapped nil :read-only t)
|
|
|
|
|
(barrier nil :read-only t)
|
|
|
|
|
(case-fold-search nil :read-only t)
|
|
|
|
|
(pop-fun nil :read-only t))
|
2012-08-04 22:31:04 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch--set-state (cmd)
|
|
|
|
|
(setq isearch-string (isearch--state-string cmd)
|
|
|
|
|
isearch-message (isearch--state-message cmd)
|
|
|
|
|
isearch-success (isearch--state-success cmd)
|
|
|
|
|
isearch-forward (isearch--state-forward cmd)
|
|
|
|
|
isearch-other-end (isearch--state-other-end cmd)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
isearch-regexp-function (isearch--state-word cmd)
|
2012-08-04 22:31:04 +00:00
|
|
|
|
isearch-error (isearch--state-error cmd)
|
|
|
|
|
isearch-wrapped (isearch--state-wrapped cmd)
|
|
|
|
|
isearch-barrier (isearch--state-barrier cmd)
|
|
|
|
|
isearch-case-fold-search (isearch--state-case-fold-search cmd))
|
|
|
|
|
(if (functionp (isearch--state-pop-fun cmd))
|
|
|
|
|
(funcall (isearch--state-pop-fun cmd) cmd))
|
|
|
|
|
(goto-char (isearch--state-point cmd)))
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-pop-state ()
|
|
|
|
|
(setq isearch-cmds (cdr isearch-cmds))
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(isearch--set-state (car isearch-cmds)))
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-push-state ()
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(push (isearch--get-state) isearch-cmds))
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +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)
|
2003-01-24 17:12:00 +00:00
|
|
|
|
(if (and search-nonincremental-instead
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(= 0 (length isearch-string)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(let ((isearch-nonincremental t))
|
2015-06-29 23:13:45 +00:00
|
|
|
|
(isearch-edit-string)) ;; this calls isearch-done as well
|
|
|
|
|
(isearch-done))
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(isearch-clean-overlays))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2011-09-14 16:07:42 +00:00
|
|
|
|
(defun isearch-fail-pos (&optional msg)
|
|
|
|
|
"Return position of first mismatch in search string, or nil if none.
|
Disambiguate function and variable references in docstrings.
* lisp/comint.el (comint-history-isearch-message): Fix ambiguous doc
string cross-reference(s).
* lisp/ffap.el (ffap-string-at-point-region, ffap-next)
(ffap-string-at-point, ffap-string-around)
(ffap-copy-string-as-kill, ffap-highlight-overlay)
(ffap-literally): Fix ambiguous doc string cross-reference(s).
* lisp/font-lock.el (font-lock-keywords-alist)
(font-lock-removed-keywords-alist): Fix ambiguous doc string
cross-reference(s).
* lisp/help-mode.el (help-xref-symbol-regexp): Add "call" as a hint for
a cross-reference to a function.
* lisp/info.el (Info-find-emacs-command-nodes): Fix ambiguous doc
string cross-reference(s).
* lisp/isearch.el (isearch-message-function, isearch-fail-pos): Fix
ambiguous doc string cross-reference(s).
* lisp/misearch.el (multi-isearch-next-buffer-function): Fix ambiguous
doc string cross-reference(s).
* lisp/newcomment.el (comment-box): Fix ambiguous doc string
cross-reference(s).
* lisp/printing.el (pr-txt-printer-alist, pr-ps-printer-alist)
(pr-setting-database): Fix ambiguous doc string
cross-reference(s).
* lisp/ps-print.el (ps-even-or-odd-pages, ps-spool-buffer-with-faces)
(ps-n-up-filling-database): Fix ambiguous doc string
cross-reference(s).
* lisp/server.el (server-buffer, server-log): Fix ambiguous doc string
cross-reference(s).
* lisp/simple.el (newline, delete-backward-char, delete-forward-char)
(minibuffer-history-isearch-message, kill-line, track-eol)
(temporary-goal-column): Fix ambiguous doc string
cross-reference(s).
* lisp/whitespace.el (whitespace-point)
(whitespace-font-lock-refontify, whitespace-bob-marker)
(whitespace-eob-marker): Fix ambiguous doc string
cross-reference(s).
* lisp/calc/calc.el (calc-highlight-selections-with-faces)
(calc-dispatch): Fix ambiguous doc string cross-reference(s).
* lisp/emacs-lisp/edebug.el (edebug-read, edebug-eval-defun): Fix
ambiguous doc string cross-reference(s).
* lisp/gnus/gnus-start.el (gnus-check-new-newsgroups): Fix ambiguous doc string
cross-reference(s).
* lisp/gnus/gnus-sum.el (gnus-summary-newsgroup-prefix): Fix ambiguous doc string
cross-reference(s).
* lisp/international/mule.el (add-to-coding-system-list): Fix ambiguous
doc string cross-reference(s).
* lisp/progmodes/cc-fonts.el (c-font-lock-keywords-3)
(c++-font-lock-keywords-3, objc-font-lock-keywords-3)
(java-font-lock-keywords-3, idl-font-lock-keywords-3)
(pike-font-lock-keywords-3): Fix ambiguous doc string
cross-reference(s).
* lisp/progmodes/compile.el (compile): Fix ambiguous doc string
cross-reference(s).
* lisp/progmodes/etags.el (tags-table-files)
(tags-table-files-function, tags-included-tables-function): Fix
ambiguous doc string cross-reference(s).
* lisp/progmodes/gdb-mi.el (gdb, gdb-setup-windows)
(gdb-restore-windows): Fix ambiguous doc string
cross-reference(s).
* lisp/textmodes/flyspell.el (flyspell-mark-duplications-flag)
(flyspell-default-deplacement-commands): Fix ambiguous doc string
cross-reference(s).
* lisp/textmodes/ispell.el (ispell-accept-output): Fix ambiguous doc
string cross-reference(s).
* lisp/textmodes/sgml-mode.el (html-tag-help): Fix ambiguous doc string
cross-reference(s).
* lisp/vc/compare-w.el (compare-ignore-whitespace)
(compare-ignore-case, compare-windows-dehighlight): Fix ambiguous
doc string cross-reference(s).
* lisp/vc/diff.el (diff): Fix ambiguous doc string cross-reference(s).
* src/insdel.c (Fcombine_after_change_execute, syms_of_insdel): Fix
ambiguous doc string cross-reference(s).
* src/keyboard.c (Fcommand_execute, syms_of_keyboard): Fix ambiguous
doc string cross-reference(s).
* src/window.c (Fwindow_point, syms_of_window): Fix ambiguous doc
string cross-reference(s).
Fixes: debbugs:12686
2013-01-11 23:08:55 +00:00
|
|
|
|
If MSG is non-nil, use variable `isearch-message', otherwise `isearch-string'."
|
2011-09-14 16:07:42 +00:00
|
|
|
|
(let ((cmds isearch-cmds)
|
|
|
|
|
(curr-msg (if msg isearch-message isearch-string))
|
|
|
|
|
succ-msg)
|
|
|
|
|
(when (or (not isearch-success) isearch-error)
|
2013-04-27 22:03:42 +00:00
|
|
|
|
(while (and cmds
|
|
|
|
|
(or (not (isearch--state-success (car cmds)))
|
|
|
|
|
(isearch--state-error (car cmds))))
|
2011-05-28 01:26:53 +00:00
|
|
|
|
(pop cmds))
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(setq succ-msg (and cmds (if msg (isearch--state-message (car cmds))
|
|
|
|
|
(isearch--state-string (car cmds)))))
|
2011-09-14 16:07:42 +00:00
|
|
|
|
(if (and (stringp succ-msg)
|
|
|
|
|
(< (length succ-msg) (length curr-msg))
|
|
|
|
|
(equal succ-msg
|
|
|
|
|
(substring curr-msg 0 (length succ-msg))))
|
|
|
|
|
(length succ-msg)
|
|
|
|
|
0))))
|
2011-05-28 01:26:53 +00:00
|
|
|
|
|
2015-11-27 11:23:35 +00:00
|
|
|
|
(defvar isearch-new-regexp-function nil
|
|
|
|
|
"Holds the next `isearch-regexp-function' inside `with-isearch-suspended'.
|
|
|
|
|
If this is set inside code wrapped by the macro
|
|
|
|
|
`with-isearch-suspended', then the value set will be used as the
|
|
|
|
|
`isearch-regexp-function' once isearch resumes.")
|
|
|
|
|
(define-obsolete-variable-alias 'isearch-new-word
|
|
|
|
|
'isearch-new-regexp-function "25.1")
|
|
|
|
|
|
2012-12-15 13:03:17 +00:00
|
|
|
|
(defmacro with-isearch-suspended (&rest body)
|
|
|
|
|
"Exit Isearch mode, run BODY, and reinvoke the pending search.
|
|
|
|
|
You can update the global isearch variables by setting new values to
|
|
|
|
|
`isearch-new-string', `isearch-new-message', `isearch-new-forward',
|
2017-02-14 23:28:15 +00:00
|
|
|
|
`isearch-new-regexp-function', `isearch-new-case-fold', `isearch-new-nonincremental'."
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; 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?
|
2012-12-15 13:03:17 +00:00
|
|
|
|
`(condition-case nil
|
1996-12-20 05:58:41 +00:00
|
|
|
|
(progn
|
2017-02-14 23:28:15 +00:00
|
|
|
|
(let ((isearch-new-nonincremental isearch-nonincremental)
|
1996-12-20 05:58:41 +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)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(isearch-new-regexp-function isearch-regexp-function)
|
2011-09-18 20:28:45 +00:00
|
|
|
|
(isearch-new-case-fold isearch-case-fold-search)
|
1996-12-20 05:58:41 +00:00
|
|
|
|
|
|
|
|
|
(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)
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(isearch-error isearch-error)
|
2016-06-04 22:06:12 +00:00
|
|
|
|
|
|
|
|
|
(multi-isearch-file-list-new multi-isearch-file-list)
|
|
|
|
|
(multi-isearch-buffer-list-new multi-isearch-buffer-list)
|
|
|
|
|
(multi-isearch-next-buffer-function multi-isearch-next-buffer-current-function)
|
|
|
|
|
(multi-isearch-current-buffer-new multi-isearch-current-buffer)
|
1996-12-20 05:58:41 +00:00
|
|
|
|
;;; 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))
|
2000-11-22 01:36:08 +00:00
|
|
|
|
|
2011-08-25 20:32:54 +00:00
|
|
|
|
;; This could protect the index of the search rings,
|
|
|
|
|
;; but we can't reliably count the number of typed M-p
|
|
|
|
|
;; in `read-from-minibuffer' to adjust the index accordingly.
|
|
|
|
|
;; So when the following is commented out, `isearch-mode'
|
|
|
|
|
;; below resets the index to the predictable value nil.
|
|
|
|
|
;; (search-ring-yank-pointer search-ring-yank-pointer)
|
|
|
|
|
;; (regexp-search-ring-yank-pointer regexp-search-ring-yank-pointer)
|
|
|
|
|
|
2000-11-22 01:36:08 +00:00
|
|
|
|
;; Temporarily restore `minibuffer-message-timeout'.
|
|
|
|
|
(minibuffer-message-timeout
|
|
|
|
|
isearch-original-minibuffer-message-timeout)
|
|
|
|
|
(isearch-original-minibuffer-message-timeout
|
|
|
|
|
isearch-original-minibuffer-message-timeout)
|
2007-07-22 22:33:48 +00:00
|
|
|
|
old-point old-other-end)
|
1996-12-20 05:58:41 +00:00
|
|
|
|
|
|
|
|
|
;; Actually terminate isearching until editing is done.
|
2003-01-24 17:12:00 +00:00
|
|
|
|
;; This is so that the user can do anything without failure,
|
1996-12-20 05:58:41 +00:00
|
|
|
|
;; like switch buffers and start another isearch, and return.
|
2011-04-19 13:44:55 +00:00
|
|
|
|
(condition-case nil
|
1996-12-20 05:58:41 +00:00
|
|
|
|
(isearch-done t t)
|
|
|
|
|
(exit nil)) ; was recursive editing
|
|
|
|
|
|
2007-07-22 22:33:48 +00:00
|
|
|
|
;; Save old point and isearch-other-end before reading from minibuffer
|
|
|
|
|
;; that can change their values.
|
|
|
|
|
(setq old-point (point) old-other-end isearch-other-end)
|
|
|
|
|
|
1996-12-20 05:58:41 +00:00
|
|
|
|
(unwind-protect
|
2012-12-15 13:03:17 +00:00
|
|
|
|
(progn ,@body)
|
2007-07-22 22:33:48 +00:00
|
|
|
|
|
1996-12-20 05:58:41 +00:00
|
|
|
|
;; Always resume isearching by restarting it.
|
2003-01-24 17:12:00 +00:00
|
|
|
|
(isearch-mode isearch-forward
|
|
|
|
|
isearch-regexp
|
|
|
|
|
isearch-op-fun
|
1996-12-20 05:58:41 +00:00
|
|
|
|
nil
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
isearch-regexp-function)
|
1996-12-20 05:58:41 +00:00
|
|
|
|
|
|
|
|
|
;; Copy new local values to isearch globals
|
|
|
|
|
(setq isearch-string isearch-new-string
|
|
|
|
|
isearch-message isearch-new-message
|
|
|
|
|
isearch-forward isearch-new-forward
|
2017-02-14 23:28:15 +00:00
|
|
|
|
isearch-nonincremental isearch-new-nonincremental
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
isearch-regexp-function isearch-new-regexp-function
|
2016-06-04 22:06:12 +00:00
|
|
|
|
isearch-case-fold-search isearch-new-case-fold
|
|
|
|
|
multi-isearch-current-buffer multi-isearch-current-buffer-new
|
|
|
|
|
multi-isearch-file-list multi-isearch-file-list-new
|
|
|
|
|
multi-isearch-buffer-list multi-isearch-buffer-list-new)
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
|
|
|
|
|
;; Restore the minibuffer message before moving point.
|
2015-11-18 21:14:30 +00:00
|
|
|
|
(funcall (or isearch-message-function #'isearch-message) nil t)
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
|
|
|
|
|
;; Set point at the start (end) of old match if forward (backward),
|
|
|
|
|
;; so after exiting minibuffer isearch resumes at the start (end)
|
|
|
|
|
;; of this match and can find it again.
|
|
|
|
|
(if (and old-other-end (eq old-point (point))
|
|
|
|
|
(eq isearch-forward isearch-new-forward))
|
|
|
|
|
(goto-char old-other-end)))
|
1996-12-20 05:58:41 +00:00
|
|
|
|
|
|
|
|
|
;; Empty isearch-string means use default.
|
2011-08-24 09:40:58 +00:00
|
|
|
|
(when (= 0 (length isearch-string))
|
|
|
|
|
(setq isearch-string (or (car (if isearch-regexp
|
|
|
|
|
regexp-search-ring
|
|
|
|
|
search-ring))
|
|
|
|
|
"")
|
|
|
|
|
|
|
|
|
|
isearch-message
|
|
|
|
|
(mapconcat 'isearch-text-char-description
|
|
|
|
|
isearch-string ""))
|
|
|
|
|
;; After taking the last element, adjust ring to previous one.
|
|
|
|
|
(isearch-ring-adjust1 nil)))
|
1996-12-20 05:58:41 +00:00
|
|
|
|
|
2008-03-14 01:02:45 +00:00
|
|
|
|
;; This used to push the state as of before this C-s, but it adds
|
|
|
|
|
;; an inconsistent state where part of variables are from the
|
|
|
|
|
;; previous search (e.g. `isearch-success'), and part of variables
|
|
|
|
|
;; are just entered from the minibuffer (e.g. `isearch-string').
|
|
|
|
|
;; (isearch-push-state)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
;; Reinvoke the pending search.
|
|
|
|
|
(isearch-search)
|
2008-03-14 01:02:45 +00:00
|
|
|
|
(isearch-push-state) ; this pushes the correct state
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(isearch-update)
|
2003-01-24 17:12:00 +00:00
|
|
|
|
(if isearch-nonincremental
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(progn
|
|
|
|
|
;; (sit-for 1) ;; needed if isearch-done does: (message "")
|
2005-08-25 10:58:48 +00:00
|
|
|
|
(isearch-done)
|
|
|
|
|
;; The search done message is confusing when the string
|
|
|
|
|
;; is empty, so erase it.
|
|
|
|
|
(if (equal isearch-string "")
|
|
|
|
|
(message "")))))
|
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
|
|
|
|
|
)))
|
|
|
|
|
|
2013-12-19 22:12:12 +00:00
|
|
|
|
(defvar minibuffer-history-symbol) ;; from external package gmhist.el
|
|
|
|
|
|
2012-12-15 13:03:17 +00:00
|
|
|
|
(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-forward-exit-minibuffer] to resume isearching forward.
|
|
|
|
|
\\[isearch-reverse-exit-minibuffer] to resume isearching backward.
|
|
|
|
|
\\[isearch-complete-edit] to complete the search string using the search ring."
|
|
|
|
|
(interactive)
|
|
|
|
|
(with-isearch-suspended
|
|
|
|
|
(let* ((message-log-max nil)
|
|
|
|
|
;; Don't add a new search string to the search ring here
|
|
|
|
|
;; in `read-from-minibuffer'. It should be added only
|
|
|
|
|
;; by `isearch-update-ring' called from `isearch-done'.
|
|
|
|
|
(history-add-new-input nil)
|
|
|
|
|
;; Binding minibuffer-history-symbol to nil is a work-around
|
|
|
|
|
;; for some incompatibility with gmhist.
|
|
|
|
|
(minibuffer-history-symbol))
|
|
|
|
|
(setq isearch-new-string
|
|
|
|
|
(read-from-minibuffer
|
|
|
|
|
(isearch-message-prefix nil isearch-nonincremental)
|
|
|
|
|
(cons isearch-string (1+ (or (isearch-fail-pos)
|
|
|
|
|
(length isearch-string))))
|
|
|
|
|
minibuffer-local-isearch-map nil
|
|
|
|
|
(if isearch-regexp
|
|
|
|
|
(cons 'regexp-search-ring
|
|
|
|
|
(1+ (or regexp-search-ring-yank-pointer -1)))
|
|
|
|
|
(cons 'search-ring
|
|
|
|
|
(1+ (or search-ring-yank-pointer -1))))
|
|
|
|
|
nil t)
|
|
|
|
|
isearch-new-message
|
|
|
|
|
(mapconcat 'isearch-text-char-description
|
|
|
|
|
isearch-new-string "")))))
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defun isearch-nonincremental-exit-minibuffer ()
|
|
|
|
|
(interactive)
|
2017-02-14 23:28:15 +00:00
|
|
|
|
(setq isearch-new-nonincremental t)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(exit-minibuffer))
|
2017-02-14 23:28:15 +00:00
|
|
|
|
;; It makes no sense to change the value of `isearch-new-nonincremental'
|
|
|
|
|
;; from nil to t during `isearch-edit-string'. Thus marked as obsolete.
|
2013-05-15 23:14:18 +00:00
|
|
|
|
(make-obsolete 'isearch-nonincremental-exit-minibuffer 'exit-minibuffer "24.4")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-forward-exit-minibuffer ()
|
2013-05-15 23:14:18 +00:00
|
|
|
|
"Resume isearching forward from the minibuffer that edits the search string."
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(interactive)
|
2017-02-14 23:28:15 +00:00
|
|
|
|
(setq isearch-new-forward t isearch-new-nonincremental nil)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(exit-minibuffer))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(defun isearch-reverse-exit-minibuffer ()
|
2013-05-15 23:14:18 +00:00
|
|
|
|
"Resume isearching backward from the minibuffer that edits the search string."
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(interactive)
|
2017-02-14 23:28:15 +00:00
|
|
|
|
(setq isearch-new-forward nil isearch-new-nonincremental nil)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(exit-minibuffer))
|
|
|
|
|
|
1994-12-05 19:34:52 +00:00
|
|
|
|
(defun isearch-cancel ()
|
|
|
|
|
"Terminate the search and go back to the starting point."
|
|
|
|
|
(interactive)
|
2009-12-07 17:30:01 +00:00
|
|
|
|
(if (and isearch-push-state-function isearch-cmds)
|
|
|
|
|
;; For defined push-state function, restore the first state.
|
|
|
|
|
;; This calls pop-state function and restores original point.
|
|
|
|
|
(let ((isearch-cmds (last isearch-cmds)))
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(isearch--set-state (car isearch-cmds)))
|
2009-12-07 17:30:01 +00:00
|
|
|
|
(goto-char isearch-opoint))
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(isearch-done t) ; Exit isearch..
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(isearch-clean-overlays)
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(signal 'quit nil)) ; ..and pass on quit signal.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-abort ()
|
1996-01-04 23:42:23 +00:00
|
|
|
|
"Abort incremental search mode if searching is successful, signaling quit.
|
1992-09-14 22:31:47 +00:00
|
|
|
|
Otherwise, revert to previous successful search and continue searching.
|
1996-01-04 23:42:23 +00:00
|
|
|
|
Use `isearch-exit' to quit without signaling."
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(interactive)
|
2012-08-04 22:31:04 +00:00
|
|
|
|
;; (ding) signal instead below, if quitting
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(discard-input)
|
2011-01-16 01:04:22 +00:00
|
|
|
|
(if (and isearch-success (not isearch-error))
|
|
|
|
|
;; If search is successful and has no incomplete regexp,
|
|
|
|
|
;; move back to starting point and really do quit.
|
2004-09-01 20:35:12 +00:00
|
|
|
|
(progn
|
|
|
|
|
(setq isearch-success nil)
|
|
|
|
|
(isearch-cancel))
|
1995-03-18 18:10:21 +00:00
|
|
|
|
;; If search is failing, or has an incomplete regexp,
|
|
|
|
|
;; rub out until it is once more successful.
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(while (or (not isearch-success) isearch-error)
|
1995-03-18 18:10:21 +00:00
|
|
|
|
(isearch-pop-state))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(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.
|
2005-11-24 09:59:37 +00:00
|
|
|
|
(if (null (if isearch-regexp regexp-search-ring search-ring))
|
|
|
|
|
(setq isearch-error "No previous search string")
|
|
|
|
|
(setq isearch-string
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(car (if isearch-regexp regexp-search-ring search-ring))
|
2005-11-24 09:59:37 +00:00
|
|
|
|
isearch-message
|
|
|
|
|
(mapconcat 'isearch-text-char-description
|
|
|
|
|
isearch-string "")
|
2011-08-24 09:40:58 +00:00
|
|
|
|
isearch-case-fold-search isearch-last-case-fold-search)
|
|
|
|
|
;; After taking the last element, adjust ring to previous one.
|
|
|
|
|
(isearch-ring-adjust1 nil))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; If already have what to search for, repeat it.
|
|
|
|
|
(or isearch-success
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(progn
|
2005-03-15 10:45:25 +00:00
|
|
|
|
;; Set isearch-wrapped before calling isearch-wrap-function
|
|
|
|
|
(setq isearch-wrapped t)
|
2004-09-01 20:35:12 +00:00
|
|
|
|
(if isearch-wrap-function
|
|
|
|
|
(funcall isearch-wrap-function)
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(goto-char (if isearch-forward (point-min) (point-max)))))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; C-s in reverse or C-r in forward, change direction.
|
2005-08-09 11:27:18 +00:00
|
|
|
|
(setq isearch-forward (not isearch-forward)
|
|
|
|
|
isearch-success t))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(setq isearch-barrier (point)) ; For subsequent \| if regexp.
|
1994-01-02 17:43:16 +00:00
|
|
|
|
|
|
|
|
|
(if (equal isearch-string "")
|
|
|
|
|
(setq isearch-success t)
|
2004-06-21 03:15:43 +00:00
|
|
|
|
(if (and isearch-success
|
|
|
|
|
(equal (point) isearch-other-end)
|
1995-12-21 17:49:54 +00:00
|
|
|
|
(not isearch-just-started))
|
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))
|
|
|
|
|
|
2015-10-28 11:43:52 +00:00
|
|
|
|
|
2016-02-06 18:44:22 +00:00
|
|
|
|
;;; Toggles for `isearch-regexp-function' and `search-default-mode'.
|
2015-10-28 11:43:52 +00:00
|
|
|
|
(defmacro isearch-define-mode-toggle (mode key function &optional docstring &rest body)
|
|
|
|
|
"Define a command called `isearch-toggle-MODE' and bind it to `M-s KEY'.
|
2015-11-29 21:26:47 +00:00
|
|
|
|
The first line of the command's docstring is auto-generated, the
|
|
|
|
|
remainder may be provided in DOCSTRING.
|
2015-10-28 11:43:52 +00:00
|
|
|
|
If FUNCTION is a symbol, this command first toggles the value of
|
|
|
|
|
`isearch-regexp-function' between nil and FUNCTION. Also set the
|
|
|
|
|
`isearch-message-prefix' property of FUNCTION.
|
|
|
|
|
The command then executes BODY and updates the isearch prompt."
|
|
|
|
|
(declare (indent defun))
|
2015-11-29 21:26:47 +00:00
|
|
|
|
(let ((command-name (intern (format "isearch-toggle-%s" mode)))
|
|
|
|
|
(key (concat "\M-s" key)))
|
2015-10-25 00:31:04 +00:00
|
|
|
|
`(progn
|
|
|
|
|
(defun ,command-name ()
|
2015-10-28 11:43:52 +00:00
|
|
|
|
,(format "Toggle %s searching on or off.%s" mode
|
|
|
|
|
(if docstring (concat "\n" docstring) ""))
|
2015-10-25 00:31:04 +00:00
|
|
|
|
(interactive)
|
2015-10-28 11:43:52 +00:00
|
|
|
|
,@(when function
|
2016-03-03 22:03:16 +00:00
|
|
|
|
`((setq isearch-regexp-function
|
|
|
|
|
(unless (eq isearch-regexp-function #',function)
|
|
|
|
|
#',function))
|
2016-02-06 22:46:16 +00:00
|
|
|
|
(setq isearch-regexp nil)))
|
2015-10-28 11:43:52 +00:00
|
|
|
|
,@body
|
2015-10-25 00:31:04 +00:00
|
|
|
|
(setq isearch-success t isearch-adjusted t)
|
|
|
|
|
(isearch-update))
|
2015-11-29 21:26:47 +00:00
|
|
|
|
(define-key isearch-mode-map ,key #',command-name)
|
2016-02-06 22:46:16 +00:00
|
|
|
|
,@(when (and function (symbolp function))
|
2015-10-28 11:43:52 +00:00
|
|
|
|
`((put ',function 'isearch-message-prefix ,(format "%s " mode))
|
2015-11-29 21:26:47 +00:00
|
|
|
|
(put ',function :advertised-binding ,key)
|
2015-10-28 11:43:52 +00:00
|
|
|
|
(cl-callf (lambda (types) (cons 'choice
|
|
|
|
|
(cons '(const :tag ,(capitalize (format "%s search" mode)) ,function)
|
|
|
|
|
(cdr types))))
|
2016-02-06 18:44:22 +00:00
|
|
|
|
(get 'search-default-mode 'custom-type)))))))
|
2015-10-28 11:43:52 +00:00
|
|
|
|
|
2015-11-30 17:30:29 +00:00
|
|
|
|
(isearch-define-mode-toggle word "w" word-search-regexp "\
|
|
|
|
|
Turning on word search turns off regexp mode.")
|
|
|
|
|
(isearch-define-mode-toggle symbol "_" isearch-symbol-regexp "\
|
|
|
|
|
Turning on symbol search turns off regexp mode.")
|
2016-05-17 20:55:38 +00:00
|
|
|
|
(isearch-define-mode-toggle char-fold "'" char-fold-to-regexp "\
|
2015-11-30 17:30:29 +00:00
|
|
|
|
Turning on character-folding turns off regexp mode.")
|
2016-05-17 20:55:38 +00:00
|
|
|
|
(put 'char-fold-to-regexp 'isearch-message-prefix "char-fold ")
|
2015-06-24 19:01:10 +00:00
|
|
|
|
|
2015-10-28 11:43:52 +00:00
|
|
|
|
(isearch-define-mode-toggle regexp "r" nil nil
|
|
|
|
|
(setq isearch-regexp (not isearch-regexp))
|
|
|
|
|
(if isearch-regexp (setq isearch-regexp-function nil)))
|
|
|
|
|
|
2015-10-28 12:01:39 +00:00
|
|
|
|
(defun isearch--momentary-message (string)
|
|
|
|
|
"Print STRING at the end of the isearch prompt for 1 second"
|
|
|
|
|
(let ((message-log-max nil))
|
|
|
|
|
(message "%s%s [%s]"
|
|
|
|
|
(isearch-message-prefix nil isearch-nonincremental)
|
|
|
|
|
isearch-message
|
|
|
|
|
string))
|
|
|
|
|
(sit-for 1))
|
|
|
|
|
|
2015-10-28 11:43:52 +00:00
|
|
|
|
(isearch-define-mode-toggle lax-whitespace " " nil
|
|
|
|
|
"In ordinary search, toggles the value of the variable
|
2012-09-02 09:31:45 +00:00
|
|
|
|
`isearch-lax-whitespace'. In regexp search, toggles the
|
|
|
|
|
value of the variable `isearch-regexp-lax-whitespace'."
|
2015-10-28 12:01:39 +00:00
|
|
|
|
(isearch--momentary-message
|
|
|
|
|
(if (if isearch-regexp
|
|
|
|
|
(setq isearch-regexp-lax-whitespace (not isearch-regexp-lax-whitespace))
|
|
|
|
|
(setq isearch-lax-whitespace (not isearch-lax-whitespace)))
|
|
|
|
|
"match spaces loosely"
|
|
|
|
|
"match spaces literally")))
|
2012-09-02 09:31:45 +00:00
|
|
|
|
|
2015-10-28 11:43:52 +00:00
|
|
|
|
(isearch-define-mode-toggle case-fold "c" nil
|
|
|
|
|
"Toggles the value of the variable `isearch-case-fold-search'."
|
2015-10-28 12:01:39 +00:00
|
|
|
|
(isearch--momentary-message
|
|
|
|
|
(if (setq isearch-case-fold-search
|
|
|
|
|
(if isearch-case-fold-search nil 'yes))
|
|
|
|
|
"case insensitive"
|
|
|
|
|
"case sensitive")))
|
1994-05-03 08:27:40 +00:00
|
|
|
|
|
2015-10-28 11:43:52 +00:00
|
|
|
|
(isearch-define-mode-toggle invisible "i" nil
|
|
|
|
|
"This determines whether to search inside invisible text or not.
|
2013-05-30 23:45:41 +00:00
|
|
|
|
Toggles the variable `isearch-invisible' between values
|
|
|
|
|
nil and a non-nil value of the option `search-invisible'
|
|
|
|
|
\(or `open' if `search-invisible' is nil)."
|
2015-10-28 12:01:39 +00:00
|
|
|
|
"match %svisible text"
|
|
|
|
|
(isearch--momentary-message
|
|
|
|
|
(if (setq isearch-invisible
|
|
|
|
|
(if isearch-invisible
|
|
|
|
|
nil (or search-invisible 'open)))
|
|
|
|
|
"match invisible text"
|
|
|
|
|
"match visible text")))
|
2013-05-30 23:45:41 +00:00
|
|
|
|
|
2012-05-17 00:03:49 +00:00
|
|
|
|
|
|
|
|
|
;; Word search
|
|
|
|
|
|
|
|
|
|
(defun word-search-regexp (string &optional lax)
|
|
|
|
|
"Return a regexp which matches words, ignoring punctuation.
|
|
|
|
|
Given STRING, a string of words separated by word delimiters,
|
|
|
|
|
compute a regexp that matches those exact words separated by
|
2013-06-13 21:49:10 +00:00
|
|
|
|
arbitrary punctuation. If the string begins or ends in whitespace,
|
|
|
|
|
the beginning or the end of the string matches arbitrary whitespace.
|
|
|
|
|
Otherwise if LAX is non-nil, the beginning or the end of the string
|
|
|
|
|
need not match a word boundary.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
|
|
|
|
|
Used in `word-search-forward', `word-search-backward',
|
|
|
|
|
`word-search-forward-lax', `word-search-backward-lax'."
|
2013-06-13 21:49:10 +00:00
|
|
|
|
(cond
|
|
|
|
|
((equal string "") "")
|
|
|
|
|
((string-match-p "\\`\\W+\\'" string) "\\W+")
|
|
|
|
|
(t (concat
|
|
|
|
|
(if (string-match-p "\\`\\W" string) "\\W+"
|
2017-02-09 22:35:22 +00:00
|
|
|
|
"\\<")
|
2013-06-13 21:49:10 +00:00
|
|
|
|
(mapconcat 'regexp-quote (split-string string "\\W+" t) "\\W+")
|
|
|
|
|
(if (string-match-p "\\W\\'" string) "\\W+"
|
|
|
|
|
(unless lax "\\>"))))))
|
2012-05-17 00:03:49 +00:00
|
|
|
|
|
|
|
|
|
(defun word-search-backward (string &optional bound noerror count)
|
|
|
|
|
"Search backward from point for STRING, ignoring differences in punctuation.
|
|
|
|
|
Set point to the beginning of the occurrence found, and return point.
|
|
|
|
|
An optional second argument bounds the search; it is a buffer position.
|
Improve documentation of search functions
Make the documentation of the search functions more accurate,
complete, and uniform; in particular, extend the description of
the effect when the 'count' parameter is a negative number to all
of these functions.
* src/search.c (Fsearch_backward, Fsearch_forward)
(Fre_search_backward, Fre_search_forward)
(Fposix_search_backward, Fposix_search_forward):
* lisp/isearch.el (word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Improve doc
strings as described above.
* doc/lispref/searching.texi (String Search, Regexp Search)
(POSIX Regexps): Use 'count' instead of 'repeat' as the name of
the fourth parameter of the *-search-{forward,backward} functions
and improve documentation as described above.
2016-07-12 20:11:22 +00:00
|
|
|
|
The match found must not begin before that position. A value of nil
|
|
|
|
|
means search to the beginning of the accessible portion of the buffer.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
Optional third argument, if t, means if fail just return nil (no error).
|
Improve documentation of search functions
Make the documentation of the search functions more accurate,
complete, and uniform; in particular, extend the description of
the effect when the 'count' parameter is a negative number to all
of these functions.
* src/search.c (Fsearch_backward, Fsearch_forward)
(Fre_search_backward, Fre_search_forward)
(Fposix_search_backward, Fposix_search_forward):
* lisp/isearch.el (word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Improve doc
strings as described above.
* doc/lispref/searching.texi (String Search, Regexp Search)
(POSIX Regexps): Use 'count' instead of 'repeat' as the name of
the fourth parameter of the *-search-{forward,backward} functions
and improve documentation as described above.
2016-07-12 20:11:22 +00:00
|
|
|
|
If not nil and not t, position at limit of search and return nil.
|
|
|
|
|
Optional fourth argument COUNT, if a positive number, means to search
|
|
|
|
|
for COUNT successive occurrences. If COUNT is negative, search
|
|
|
|
|
forward, instead of backward, for -COUNT occurrences. A value of
|
|
|
|
|
nil means the same as 1.
|
|
|
|
|
With COUNT positive, the match found is the COUNTth to last one (or
|
|
|
|
|
last, if COUNT is 1 or nil) in the buffer located entirely before
|
|
|
|
|
the origin of the search; correspondingly with COUNT negative.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
|
|
|
|
|
Relies on the function `word-search-regexp' to convert a sequence
|
|
|
|
|
of words in STRING to a regexp used to search words without regard
|
2015-11-30 17:30:29 +00:00
|
|
|
|
to punctuation.
|
2015-12-01 19:29:14 +00:00
|
|
|
|
This command does not support character folding, and lax space matching
|
|
|
|
|
has no effect on it."
|
2012-05-17 00:03:49 +00:00
|
|
|
|
(interactive "sWord search backward: ")
|
|
|
|
|
(re-search-backward (word-search-regexp string nil) bound noerror count))
|
|
|
|
|
|
|
|
|
|
(defun word-search-forward (string &optional bound noerror count)
|
|
|
|
|
"Search forward from point for STRING, ignoring differences in punctuation.
|
|
|
|
|
Set point to the end of the occurrence found, and return point.
|
|
|
|
|
An optional second argument bounds the search; it is a buffer position.
|
Improve documentation of search functions
Make the documentation of the search functions more accurate,
complete, and uniform; in particular, extend the description of
the effect when the 'count' parameter is a negative number to all
of these functions.
* src/search.c (Fsearch_backward, Fsearch_forward)
(Fre_search_backward, Fre_search_forward)
(Fposix_search_backward, Fposix_search_forward):
* lisp/isearch.el (word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Improve doc
strings as described above.
* doc/lispref/searching.texi (String Search, Regexp Search)
(POSIX Regexps): Use 'count' instead of 'repeat' as the name of
the fourth parameter of the *-search-{forward,backward} functions
and improve documentation as described above.
2016-07-12 20:11:22 +00:00
|
|
|
|
The match found must not end after that position. A value of nil
|
|
|
|
|
means search to the end of the accessible portion of the buffer.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
Optional third argument, if t, means if fail just return nil (no error).
|
|
|
|
|
If not nil and not t, move to limit of search and return nil.
|
Improve documentation of search functions
Make the documentation of the search functions more accurate,
complete, and uniform; in particular, extend the description of
the effect when the 'count' parameter is a negative number to all
of these functions.
* src/search.c (Fsearch_backward, Fsearch_forward)
(Fre_search_backward, Fre_search_forward)
(Fposix_search_backward, Fposix_search_forward):
* lisp/isearch.el (word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Improve doc
strings as described above.
* doc/lispref/searching.texi (String Search, Regexp Search)
(POSIX Regexps): Use 'count' instead of 'repeat' as the name of
the fourth parameter of the *-search-{forward,backward} functions
and improve documentation as described above.
2016-07-12 20:11:22 +00:00
|
|
|
|
Optional fourth argument COUNT, if a positive number, means to search
|
|
|
|
|
for COUNT successive occurrences. If COUNT is negative, search
|
|
|
|
|
backward, instead of forward, for -COUNT occurrences. A value of
|
|
|
|
|
nil means the same as 1.
|
|
|
|
|
With COUNT positive, the match found is the COUNTth one (or first,
|
|
|
|
|
if COUNT is 1 or nil) in the buffer located entirely after the
|
|
|
|
|
origin of the search; correspondingly with COUNT negative.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
|
|
|
|
|
Relies on the function `word-search-regexp' to convert a sequence
|
|
|
|
|
of words in STRING to a regexp used to search words without regard
|
2015-11-30 17:30:29 +00:00
|
|
|
|
to punctuation.
|
2015-12-01 19:29:14 +00:00
|
|
|
|
This command does not support character folding, and lax space matching
|
|
|
|
|
has no effect on it."
|
2012-05-17 00:03:49 +00:00
|
|
|
|
(interactive "sWord search: ")
|
|
|
|
|
(re-search-forward (word-search-regexp string nil) bound noerror count))
|
|
|
|
|
|
|
|
|
|
(defun word-search-backward-lax (string &optional bound noerror count)
|
|
|
|
|
"Search backward from point for STRING, ignoring differences in punctuation.
|
|
|
|
|
Set point to the beginning of the occurrence found, and return point.
|
|
|
|
|
|
|
|
|
|
Unlike `word-search-backward', the end of STRING need not match a word
|
|
|
|
|
boundary, unless STRING ends in whitespace.
|
|
|
|
|
|
|
|
|
|
An optional second argument bounds the search; it is a buffer position.
|
Improve documentation of search functions
Make the documentation of the search functions more accurate,
complete, and uniform; in particular, extend the description of
the effect when the 'count' parameter is a negative number to all
of these functions.
* src/search.c (Fsearch_backward, Fsearch_forward)
(Fre_search_backward, Fre_search_forward)
(Fposix_search_backward, Fposix_search_forward):
* lisp/isearch.el (word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Improve doc
strings as described above.
* doc/lispref/searching.texi (String Search, Regexp Search)
(POSIX Regexps): Use 'count' instead of 'repeat' as the name of
the fourth parameter of the *-search-{forward,backward} functions
and improve documentation as described above.
2016-07-12 20:11:22 +00:00
|
|
|
|
The match found must not begin before that position. A value of nil
|
|
|
|
|
means search to the beginning of the accessible portion of the buffer.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
Optional third argument, if t, means if fail just return nil (no error).
|
Improve documentation of search functions
Make the documentation of the search functions more accurate,
complete, and uniform; in particular, extend the description of
the effect when the 'count' parameter is a negative number to all
of these functions.
* src/search.c (Fsearch_backward, Fsearch_forward)
(Fre_search_backward, Fre_search_forward)
(Fposix_search_backward, Fposix_search_forward):
* lisp/isearch.el (word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Improve doc
strings as described above.
* doc/lispref/searching.texi (String Search, Regexp Search)
(POSIX Regexps): Use 'count' instead of 'repeat' as the name of
the fourth parameter of the *-search-{forward,backward} functions
and improve documentation as described above.
2016-07-12 20:11:22 +00:00
|
|
|
|
If not nil and not t, position at limit of search and return nil.
|
|
|
|
|
Optional fourth argument COUNT, if a positive number, means to search
|
|
|
|
|
for COUNT successive occurrences. If COUNT is negative, search
|
|
|
|
|
forward, instead of backward, for -COUNT occurrences. A value of
|
|
|
|
|
nil means the same as 1.
|
|
|
|
|
With COUNT positive, the match found is the COUNTth to last one (or
|
|
|
|
|
last, if COUNT is 1 or nil) in the buffer located entirely before
|
|
|
|
|
the origin of the search; correspondingly with COUNT negative.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
|
|
|
|
|
Relies on the function `word-search-regexp' to convert a sequence
|
|
|
|
|
of words in STRING to a regexp used to search words without regard
|
2015-11-30 17:30:29 +00:00
|
|
|
|
to punctuation.
|
2015-12-01 19:29:14 +00:00
|
|
|
|
This command does not support character folding, and lax space matching
|
|
|
|
|
has no effect on it."
|
2012-05-17 00:03:49 +00:00
|
|
|
|
(interactive "sWord search backward: ")
|
|
|
|
|
(re-search-backward (word-search-regexp string t) bound noerror count))
|
|
|
|
|
|
|
|
|
|
(defun word-search-forward-lax (string &optional bound noerror count)
|
|
|
|
|
"Search forward from point for STRING, ignoring differences in punctuation.
|
|
|
|
|
Set point to the end of the occurrence found, and return point.
|
|
|
|
|
|
|
|
|
|
Unlike `word-search-forward', the end of STRING need not match a word
|
|
|
|
|
boundary, unless STRING ends in whitespace.
|
|
|
|
|
|
|
|
|
|
An optional second argument bounds the search; it is a buffer position.
|
Improve documentation of search functions
Make the documentation of the search functions more accurate,
complete, and uniform; in particular, extend the description of
the effect when the 'count' parameter is a negative number to all
of these functions.
* src/search.c (Fsearch_backward, Fsearch_forward)
(Fre_search_backward, Fre_search_forward)
(Fposix_search_backward, Fposix_search_forward):
* lisp/isearch.el (word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Improve doc
strings as described above.
* doc/lispref/searching.texi (String Search, Regexp Search)
(POSIX Regexps): Use 'count' instead of 'repeat' as the name of
the fourth parameter of the *-search-{forward,backward} functions
and improve documentation as described above.
2016-07-12 20:11:22 +00:00
|
|
|
|
The match found must not end after that position. A value of nil
|
|
|
|
|
means search to the end of the accessible portion of the buffer.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
Optional third argument, if t, means if fail just return nil (no error).
|
|
|
|
|
If not nil and not t, move to limit of search and return nil.
|
Improve documentation of search functions
Make the documentation of the search functions more accurate,
complete, and uniform; in particular, extend the description of
the effect when the 'count' parameter is a negative number to all
of these functions.
* src/search.c (Fsearch_backward, Fsearch_forward)
(Fre_search_backward, Fre_search_forward)
(Fposix_search_backward, Fposix_search_forward):
* lisp/isearch.el (word-search-backward, word-search-forward)
(word-search-backward-lax, word-search-forward-lax): Improve doc
strings as described above.
* doc/lispref/searching.texi (String Search, Regexp Search)
(POSIX Regexps): Use 'count' instead of 'repeat' as the name of
the fourth parameter of the *-search-{forward,backward} functions
and improve documentation as described above.
2016-07-12 20:11:22 +00:00
|
|
|
|
Optional fourth argument COUNT, if a positive number, means to search
|
|
|
|
|
for COUNT successive occurrences. If COUNT is negative, search
|
|
|
|
|
backward, instead of forward, for -COUNT occurrences. A value of
|
|
|
|
|
nil means the same as 1.
|
|
|
|
|
With COUNT positive, the match found is the COUNTth one (or first,
|
|
|
|
|
if COUNT is 1 or nil) in the buffer located entirely after the
|
|
|
|
|
origin of the search; correspondingly with COUNT negative.
|
2012-05-17 00:03:49 +00:00
|
|
|
|
|
|
|
|
|
Relies on the function `word-search-regexp' to convert a sequence
|
|
|
|
|
of words in STRING to a regexp used to search words without regard
|
2015-11-30 17:30:29 +00:00
|
|
|
|
to punctuation.
|
2015-12-01 19:29:14 +00:00
|
|
|
|
This command does not support character folding, and lax space matching
|
|
|
|
|
has no effect on it."
|
2012-05-17 00:03:49 +00:00
|
|
|
|
(interactive "sWord search: ")
|
|
|
|
|
(re-search-forward (word-search-regexp string t) bound noerror count))
|
|
|
|
|
|
2012-05-29 09:46:06 +00:00
|
|
|
|
;; Symbol search
|
|
|
|
|
|
|
|
|
|
(defun isearch-symbol-regexp (string &optional lax)
|
|
|
|
|
"Return a regexp which matches STRING as a symbol.
|
|
|
|
|
Creates a regexp where STRING is surrounded by symbol delimiters \\_< and \\_>.
|
2013-06-13 21:49:10 +00:00
|
|
|
|
If there are more than one symbol, then compute a regexp that matches
|
|
|
|
|
those exact symbols separated by non-symbol characters. If the string
|
|
|
|
|
begins or ends in whitespace, the beginning or the end of the string
|
|
|
|
|
matches arbitrary non-symbol whitespace. Otherwise if LAX is non-nil,
|
|
|
|
|
the beginning or the end of the string need not match a symbol boundary."
|
|
|
|
|
(let ((not-word-symbol-re
|
|
|
|
|
;; This regexp matches all syntaxes except word and symbol syntax.
|
|
|
|
|
;; FIXME: Replace it with something shorter if possible (bug#14602).
|
|
|
|
|
"\\(?:\\s-\\|\\s.\\|\\s(\\|\\s)\\|\\s\"\\|\\s\\\\|\\s/\\|\\s$\\|\\s'\\|\\s<\\|\\s>\\|\\s@\\|\\s!\\|\\s|\\)+"))
|
|
|
|
|
(cond
|
|
|
|
|
((equal string "") "")
|
|
|
|
|
((string-match-p (format "\\`%s\\'" not-word-symbol-re) string) not-word-symbol-re)
|
|
|
|
|
(t (concat
|
|
|
|
|
(if (string-match-p (format "\\`%s" not-word-symbol-re) string) not-word-symbol-re
|
2017-02-09 22:35:22 +00:00
|
|
|
|
"\\_<")
|
2013-06-13 21:49:10 +00:00
|
|
|
|
(mapconcat 'regexp-quote (split-string string not-word-symbol-re t) not-word-symbol-re)
|
|
|
|
|
(if (string-match-p (format "%s\\'" not-word-symbol-re) string) not-word-symbol-re
|
|
|
|
|
(unless lax "\\_>")))))))
|
2012-05-29 09:46:06 +00:00
|
|
|
|
|
|
|
|
|
(put 'isearch-symbol-regexp 'isearch-message-prefix "symbol ")
|
|
|
|
|
|
2012-09-02 09:31:45 +00:00
|
|
|
|
;; Search with lax whitespace
|
|
|
|
|
|
|
|
|
|
(defun search-forward-lax-whitespace (string &optional bound noerror count)
|
|
|
|
|
"Search forward for STRING, matching a sequence of whitespace chars."
|
|
|
|
|
(let ((search-spaces-regexp search-whitespace-regexp))
|
|
|
|
|
(re-search-forward (regexp-quote string) bound noerror count)))
|
|
|
|
|
|
|
|
|
|
(defun search-backward-lax-whitespace (string &optional bound noerror count)
|
|
|
|
|
"Search backward for STRING, matching a sequence of whitespace chars."
|
|
|
|
|
(let ((search-spaces-regexp search-whitespace-regexp))
|
|
|
|
|
(re-search-backward (regexp-quote string) bound noerror count)))
|
|
|
|
|
|
|
|
|
|
(defun re-search-forward-lax-whitespace (regexp &optional bound noerror count)
|
|
|
|
|
"Search forward for REGEXP, matching a sequence of whitespace chars."
|
|
|
|
|
(let ((search-spaces-regexp search-whitespace-regexp))
|
|
|
|
|
(re-search-forward regexp bound noerror count)))
|
|
|
|
|
|
|
|
|
|
(defun re-search-backward-lax-whitespace (regexp &optional bound noerror count)
|
|
|
|
|
"Search backward for REGEXP, matching a sequence of whitespace chars."
|
|
|
|
|
(let ((search-spaces-regexp search-whitespace-regexp))
|
|
|
|
|
(re-search-backward regexp bound noerror count)))
|
|
|
|
|
|
2015-10-21 16:27:23 +00:00
|
|
|
|
(dolist (old '(re-search-forward-lax-whitespace search-backward-lax-whitespace
|
|
|
|
|
search-forward-lax-whitespace re-search-backward-lax-whitespace))
|
|
|
|
|
(make-obsolete old
|
|
|
|
|
"instead, use (let ((search-spaces-regexp search-whitespace-regexp))
|
|
|
|
|
(re-search-... ...))"
|
|
|
|
|
"25.1"))
|
|
|
|
|
|
2012-05-17 00:03:49 +00:00
|
|
|
|
|
2013-12-19 00:29:41 +00:00
|
|
|
|
(defun isearch-query-replace (&optional arg regexp-flag)
|
2008-10-19 22:33:17 +00:00
|
|
|
|
"Start `query-replace' with string to replace from last search string.
|
2013-12-19 00:29:41 +00:00
|
|
|
|
The ARG (prefix arg if interactive), if non-nil, means replace
|
|
|
|
|
only matches surrounded by word boundaries. A negative prefix
|
|
|
|
|
arg means replace backward. Note that using the prefix arg
|
2013-06-13 22:08:45 +00:00
|
|
|
|
is possible only when `isearch-allow-scroll' is non-nil or
|
|
|
|
|
`isearch-allow-prefix' is non-nil, and it doesn't always provide the
|
|
|
|
|
correct matches for `query-replace', so the preferred way to run word
|
|
|
|
|
replacements from Isearch is `M-s w ... M-%'."
|
2008-10-19 22:33:17 +00:00
|
|
|
|
(interactive
|
|
|
|
|
(list current-prefix-arg))
|
2004-07-05 23:28:42 +00:00
|
|
|
|
(barf-if-buffer-read-only)
|
2004-09-03 20:32:57 +00:00
|
|
|
|
(if regexp-flag (setq isearch-regexp t))
|
2007-12-09 23:47:59 +00:00
|
|
|
|
(let ((case-fold-search isearch-case-fold-search)
|
|
|
|
|
;; set `search-upper-case' to nil to not call
|
|
|
|
|
;; `isearch-no-upper-case-p' in `perform-replace'
|
2008-11-11 19:48:37 +00:00
|
|
|
|
(search-upper-case nil)
|
2013-05-30 23:45:41 +00:00
|
|
|
|
(search-invisible isearch-invisible)
|
2012-09-06 08:49:40 +00:00
|
|
|
|
(replace-lax-whitespace
|
2012-09-09 22:15:24 +00:00
|
|
|
|
isearch-lax-whitespace)
|
|
|
|
|
(replace-regexp-lax-whitespace
|
|
|
|
|
isearch-regexp-lax-whitespace)
|
2013-12-19 00:29:41 +00:00
|
|
|
|
(delimited (and arg (not (eq arg '-))))
|
|
|
|
|
(backward (and arg (eq arg '-)))
|
2008-11-11 19:48:37 +00:00
|
|
|
|
;; Set `isearch-recursive-edit' to nil to prevent calling
|
|
|
|
|
;; `exit-recursive-edit' in `isearch-done' that terminates
|
|
|
|
|
;; the execution of this command when it is non-nil.
|
|
|
|
|
;; We call `exit-recursive-edit' explicitly at the end below.
|
|
|
|
|
(isearch-recursive-edit nil))
|
|
|
|
|
(isearch-done nil t)
|
2004-07-01 09:54:51 +00:00
|
|
|
|
(isearch-clean-overlays)
|
2005-12-14 07:52:22 +00:00
|
|
|
|
(if (and isearch-other-end
|
2013-12-19 00:29:41 +00:00
|
|
|
|
(if backward
|
|
|
|
|
(> isearch-other-end (point))
|
|
|
|
|
(< isearch-other-end (point)))
|
2004-09-03 20:32:57 +00:00
|
|
|
|
(not (and transient-mark-mode mark-active
|
2013-12-19 00:29:41 +00:00
|
|
|
|
(if backward
|
|
|
|
|
(> (mark) (point))
|
|
|
|
|
(< (mark) (point))))))
|
2004-09-03 20:32:57 +00:00
|
|
|
|
(goto-char isearch-other-end))
|
|
|
|
|
(set query-replace-from-history-variable
|
|
|
|
|
(cons isearch-string
|
|
|
|
|
(symbol-value query-replace-from-history-variable)))
|
2004-07-05 23:28:42 +00:00
|
|
|
|
(perform-replace
|
|
|
|
|
isearch-string
|
2004-09-03 20:32:57 +00:00
|
|
|
|
(query-replace-read-to
|
|
|
|
|
isearch-string
|
2008-10-19 22:33:17 +00:00
|
|
|
|
(concat "Query replace"
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(isearch--describe-regexp-mode (or delimited isearch-regexp-function) t)
|
2013-12-19 00:29:41 +00:00
|
|
|
|
(if backward " backward" "")
|
2008-10-19 22:33:17 +00:00
|
|
|
|
(if (and transient-mark-mode mark-active) " in region" ""))
|
2004-09-03 20:32:57 +00:00
|
|
|
|
isearch-regexp)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
t isearch-regexp (or delimited isearch-regexp-function) nil nil
|
2004-09-03 20:32:57 +00:00
|
|
|
|
(if (and transient-mark-mode mark-active) (region-beginning))
|
2013-12-19 00:29:41 +00:00
|
|
|
|
(if (and transient-mark-mode mark-active) (region-end))
|
|
|
|
|
backward))
|
2008-11-11 19:48:37 +00:00
|
|
|
|
(and isearch-recursive-edit (exit-recursive-edit)))
|
2004-07-01 09:54:51 +00:00
|
|
|
|
|
2013-12-19 00:29:41 +00:00
|
|
|
|
(defun isearch-query-replace-regexp (&optional arg)
|
2008-10-19 22:33:17 +00:00
|
|
|
|
"Start `query-replace-regexp' with string to replace from last search string.
|
|
|
|
|
See `isearch-query-replace' for more information."
|
|
|
|
|
(interactive
|
|
|
|
|
(list current-prefix-arg))
|
2013-12-19 00:29:41 +00:00
|
|
|
|
(isearch-query-replace arg t))
|
2004-07-01 09:54:51 +00:00
|
|
|
|
|
2007-12-09 23:47:59 +00:00
|
|
|
|
(defun isearch-occur (regexp &optional nlines)
|
2012-02-23 00:36:49 +00:00
|
|
|
|
"Run `occur' using the last search string as the regexp.
|
|
|
|
|
Interactively, REGEXP is constructed using the search string from the
|
|
|
|
|
last search command. NLINES has the same meaning as in `occur'.
|
|
|
|
|
|
|
|
|
|
If the last search command was a word search, REGEXP is computed from
|
|
|
|
|
the search words, ignoring punctuation. If the last search
|
|
|
|
|
command was a regular expression search, REGEXP is the regular
|
|
|
|
|
expression used in that search. If the last search command searched
|
|
|
|
|
for a literal string, REGEXP is constructed by quoting all the special
|
|
|
|
|
characters in that string."
|
2007-12-09 23:47:59 +00:00
|
|
|
|
(interactive
|
2012-02-23 00:36:49 +00:00
|
|
|
|
(let* ((perform-collect (consp current-prefix-arg))
|
|
|
|
|
(regexp (cond
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
((functionp isearch-regexp-function)
|
|
|
|
|
(funcall isearch-regexp-function isearch-string))
|
|
|
|
|
(isearch-regexp-function (word-search-regexp isearch-string))
|
2012-02-23 00:36:49 +00:00
|
|
|
|
(isearch-regexp isearch-string)
|
|
|
|
|
(t (regexp-quote isearch-string)))))
|
|
|
|
|
(list regexp
|
|
|
|
|
(if perform-collect
|
|
|
|
|
;; Perform collect operation
|
|
|
|
|
(if (zerop (regexp-opt-depth regexp))
|
|
|
|
|
;; No subexpression so collect the entire match.
|
|
|
|
|
"\\&"
|
|
|
|
|
;; Get the regexp for collection pattern.
|
2013-06-13 22:08:45 +00:00
|
|
|
|
(let ((default (car occur-collect-regexp-history))
|
|
|
|
|
regexp-collect)
|
|
|
|
|
(with-isearch-suspended
|
|
|
|
|
(setq regexp-collect
|
|
|
|
|
(read-regexp
|
|
|
|
|
(format "Regexp to collect (default %s): " default)
|
|
|
|
|
default 'occur-collect-regexp-history)))
|
|
|
|
|
regexp-collect))
|
2012-02-23 00:36:49 +00:00
|
|
|
|
;; Otherwise normal occur takes numerical prefix argument.
|
|
|
|
|
(when current-prefix-arg
|
|
|
|
|
(prefix-numeric-value current-prefix-arg))))))
|
2007-12-09 23:47:59 +00:00
|
|
|
|
(let ((case-fold-search isearch-case-fold-search)
|
2011-08-25 20:48:45 +00:00
|
|
|
|
;; Set `search-upper-case' to nil to not call
|
|
|
|
|
;; `isearch-no-upper-case-p' in `occur-1'.
|
|
|
|
|
(search-upper-case nil)
|
2012-09-02 09:31:45 +00:00
|
|
|
|
(search-spaces-regexp
|
|
|
|
|
(if (if isearch-regexp
|
|
|
|
|
isearch-regexp-lax-whitespace
|
|
|
|
|
isearch-lax-whitespace)
|
|
|
|
|
search-whitespace-regexp)))
|
2015-11-20 00:00:48 +00:00
|
|
|
|
(occur (if isearch-regexp-function
|
|
|
|
|
(propertize regexp
|
|
|
|
|
'isearch-string isearch-string
|
|
|
|
|
'isearch-regexp-function-descr
|
|
|
|
|
(isearch--describe-regexp-mode isearch-regexp-function))
|
|
|
|
|
regexp)
|
|
|
|
|
nlines)))
|
2007-12-09 23:47:59 +00:00
|
|
|
|
|
2008-06-25 20:22:14 +00:00
|
|
|
|
(declare-function hi-lock-read-face-name "hi-lock" ())
|
|
|
|
|
|
2008-07-31 17:19:28 +00:00
|
|
|
|
(defun isearch-highlight-regexp ()
|
2008-06-25 20:22:14 +00:00
|
|
|
|
"Run `highlight-regexp' with regexp from the current search string.
|
2008-07-31 17:19:28 +00:00
|
|
|
|
It exits Isearch mode and calls `hi-lock-face-buffer' with its regexp
|
|
|
|
|
argument from the last search regexp or a quoted search string,
|
|
|
|
|
and reads its face argument using `hi-lock-read-face-name'."
|
|
|
|
|
(interactive)
|
2008-11-11 19:48:37 +00:00
|
|
|
|
(let (
|
|
|
|
|
;; Set `isearch-recursive-edit' to nil to prevent calling
|
|
|
|
|
;; `exit-recursive-edit' in `isearch-done' that terminates
|
|
|
|
|
;; the execution of this command when it is non-nil.
|
|
|
|
|
;; We call `exit-recursive-edit' explicitly at the end below.
|
|
|
|
|
(isearch-recursive-edit nil))
|
|
|
|
|
(isearch-done nil t)
|
|
|
|
|
(isearch-clean-overlays))
|
2008-07-31 17:19:28 +00:00
|
|
|
|
(require 'hi-lock nil t)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(let ((regexp (cond ((functionp isearch-regexp-function)
|
|
|
|
|
(funcall isearch-regexp-function isearch-string))
|
|
|
|
|
(isearch-regexp-function (word-search-regexp isearch-string))
|
2013-06-03 08:51:50 +00:00
|
|
|
|
(isearch-regexp isearch-string)
|
2008-08-29 19:15:19 +00:00
|
|
|
|
((if (and (eq isearch-case-fold-search t)
|
|
|
|
|
search-upper-case)
|
|
|
|
|
(isearch-no-upper-case-p
|
|
|
|
|
isearch-string isearch-regexp)
|
|
|
|
|
isearch-case-fold-search)
|
|
|
|
|
;; Turn isearch-string into a case-insensitive
|
|
|
|
|
;; regexp.
|
2008-09-03 00:01:25 +00:00
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (c)
|
|
|
|
|
(let ((s (string c)))
|
|
|
|
|
(if (string-match "[[:alpha:]]" s)
|
|
|
|
|
(format "[%s%s]" (upcase s) (downcase s))
|
|
|
|
|
(regexp-quote s))))
|
|
|
|
|
isearch-string ""))
|
2008-08-29 19:15:19 +00:00
|
|
|
|
(t (regexp-quote isearch-string)))))
|
2013-06-03 08:51:50 +00:00
|
|
|
|
(hi-lock-face-buffer regexp (hi-lock-read-face-name)))
|
2008-11-11 19:48:37 +00:00
|
|
|
|
(and isearch-recursive-edit (exit-recursive-edit)))
|
2008-06-25 20:22:14 +00:00
|
|
|
|
|
2004-07-01 09:54:51 +00:00
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(defun isearch-delete-char ()
|
2001-12-03 06:13:55 +00:00
|
|
|
|
"Discard last input item and move point back.
|
2012-12-15 12:19:04 +00:00
|
|
|
|
Last input means the last character or the last isearch command
|
|
|
|
|
that added or deleted characters from the search string,
|
|
|
|
|
moved point, toggled regexp mode or case-sensitivity, etc.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
If no previous match was done, just beep."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (null (cdr isearch-cmds))
|
|
|
|
|
(ding)
|
|
|
|
|
(isearch-pop-state))
|
|
|
|
|
(isearch-update))
|
|
|
|
|
|
2004-07-01 09:54:51 +00:00
|
|
|
|
(defun isearch-del-char (&optional arg)
|
|
|
|
|
"Delete character from end of search string and search again.
|
2012-12-15 12:19:04 +00:00
|
|
|
|
Unlike `isearch-delete-char', it only deletes the last character,
|
|
|
|
|
but doesn't cancel the effect of other isearch command.
|
2004-07-01 09:54:51 +00:00
|
|
|
|
If search string is empty, just beep."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(if (= 0 (length isearch-string))
|
2004-04-29 15:28:55 +00:00
|
|
|
|
(ding)
|
2013-06-13 21:11:42 +00:00
|
|
|
|
(setq isearch-string (substring isearch-string 0
|
|
|
|
|
(- (min (or arg 1)
|
|
|
|
|
(length isearch-string))))
|
2004-04-29 15:28:55 +00:00
|
|
|
|
isearch-message (mapconcat 'isearch-text-char-description
|
2007-07-22 22:33:48 +00:00
|
|
|
|
isearch-string "")))
|
2015-11-18 21:14:30 +00:00
|
|
|
|
;; Do the following before moving point.
|
|
|
|
|
(funcall (or isearch-message-function #'isearch-message) nil t)
|
2007-07-22 22:33:48 +00:00
|
|
|
|
;; Use the isearch-other-end as new starting point to be able
|
|
|
|
|
;; to find the remaining part of the search string again.
|
2013-06-13 21:11:42 +00:00
|
|
|
|
;; This is like what `isearch-search-and-update' does,
|
|
|
|
|
;; but currently it doesn't support deletion of characters
|
|
|
|
|
;; for the case where unsuccessful search may become successful
|
|
|
|
|
;; by deletion of characters.
|
2007-07-22 22:33:48 +00:00
|
|
|
|
(if isearch-other-end (goto-char isearch-other-end))
|
|
|
|
|
(isearch-search)
|
|
|
|
|
(isearch-push-state)
|
|
|
|
|
(isearch-update))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1997-11-18 22:31:16 +00:00
|
|
|
|
(defun isearch-yank-string (string)
|
|
|
|
|
"Pull STRING into search string."
|
|
|
|
|
;; Downcase the string if not supposed to case-fold yanked strings.
|
|
|
|
|
(if (and isearch-case-fold-search
|
|
|
|
|
(eq 'not-yanks search-upper-case))
|
|
|
|
|
(setq string (downcase string)))
|
|
|
|
|
(if isearch-regexp (setq string (regexp-quote string)))
|
2010-05-20 21:49:49 +00:00
|
|
|
|
;; Don't move cursor in reverse search.
|
|
|
|
|
(setq isearch-yank-flag t)
|
|
|
|
|
(isearch-process-search-string
|
|
|
|
|
string (mapconcat 'isearch-text-char-description string "")))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1993-10-24 04:05:22 +00:00
|
|
|
|
(defun isearch-yank-kill ()
|
|
|
|
|
"Pull string from kill ring into search string."
|
|
|
|
|
(interactive)
|
1997-11-18 22:31:16 +00:00
|
|
|
|
(isearch-yank-string (current-kill 0)))
|
|
|
|
|
|
2011-05-03 03:34:26 +00:00
|
|
|
|
(defun isearch-yank-pop ()
|
|
|
|
|
"Replace just-yanked search string with previously killed string."
|
|
|
|
|
(interactive)
|
|
|
|
|
(if (not (memq last-command '(isearch-yank-kill isearch-yank-pop)))
|
|
|
|
|
;; Fall back on `isearch-yank-kill' for the benefits of people
|
|
|
|
|
;; who are used to the old behavior of `M-y' in isearch mode. In
|
|
|
|
|
;; future, this fallback may be changed if we ever change
|
|
|
|
|
;; `yank-pop' to do something like the kill-ring-browser.
|
|
|
|
|
(isearch-yank-kill)
|
|
|
|
|
(isearch-pop-state)
|
|
|
|
|
(isearch-yank-string (current-kill 1))))
|
|
|
|
|
|
1997-11-18 22:31:16 +00:00
|
|
|
|
(defun isearch-yank-x-selection ()
|
1999-09-27 22:15:50 +00:00
|
|
|
|
"Pull current X selection into search string."
|
1997-11-18 22:31:16 +00:00
|
|
|
|
(interactive)
|
2015-04-29 06:32:09 +00:00
|
|
|
|
(isearch-yank-string (gui-get-selection))
|
|
|
|
|
;; If `gui-get-selection' returned the text from the active region,
|
2011-11-29 18:39:16 +00:00
|
|
|
|
;; then it "used" the mark which we should hence deactivate.
|
|
|
|
|
(when select-active-regions (deactivate-mark)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2001-08-31 08:51:39 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(defun isearch-mouse-2 (click)
|
2001-08-31 08:51:39 +00:00
|
|
|
|
"Handle mouse-2 in Isearch mode.
|
1999-09-27 22:15:50 +00:00
|
|
|
|
For a click in the echo area, invoke `isearch-yank-x-selection'.
|
2006-10-03 14:03:46 +00:00
|
|
|
|
Otherwise invoke whatever the calling mouse-2 command sequence
|
|
|
|
|
is bound to outside of Isearch."
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(interactive "e")
|
2017-05-29 19:43:23 +00:00
|
|
|
|
(let ((w (posn-window (event-start click)))
|
|
|
|
|
(binding (let ((overriding-terminal-local-map nil))
|
|
|
|
|
(key-binding (this-command-keys-vector) t))))
|
1999-09-27 22:15:50 +00:00
|
|
|
|
(if (and (window-minibuffer-p w)
|
|
|
|
|
(not (minibuffer-window-active-p w))) ; in echo area
|
|
|
|
|
(isearch-yank-x-selection)
|
2002-11-07 17:46:04 +00:00
|
|
|
|
(when (functionp binding)
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(call-interactively binding)))))
|
2001-08-31 08:51:39 +00:00
|
|
|
|
|
2016-05-22 20:38:53 +00:00
|
|
|
|
(declare-function xterm--pasted-text "term/xterm" ())
|
|
|
|
|
|
|
|
|
|
(defun isearch-xterm-paste ()
|
|
|
|
|
"Pull terminal paste into search string."
|
|
|
|
|
(interactive)
|
|
|
|
|
(isearch-yank-string (xterm--pasted-text)))
|
|
|
|
|
|
2001-11-28 22:34:20 +00:00
|
|
|
|
(defun isearch-yank-internal (jumpform)
|
|
|
|
|
"Pull the text from point to the point reached by JUMPFORM.
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
JUMPFORM is a lambda expression that takes no arguments and returns
|
|
|
|
|
a buffer position, possibly having moved point to that position.
|
|
|
|
|
For example, it might move point forward by a word and return point,
|
|
|
|
|
or it might return the position of the end of the line."
|
1997-11-18 22:31:16 +00:00
|
|
|
|
(isearch-yank-string
|
|
|
|
|
(save-excursion
|
|
|
|
|
(and (not isearch-forward) isearch-other-end
|
|
|
|
|
(goto-char isearch-other-end))
|
2001-11-28 22:34:20 +00:00
|
|
|
|
(buffer-substring-no-properties (point) (funcall jumpform)))))
|
|
|
|
|
|
2004-07-01 09:54:51 +00:00
|
|
|
|
(defun isearch-yank-char-in-minibuffer (&optional arg)
|
|
|
|
|
"Pull next character from buffer into end of search string in minibuffer."
|
|
|
|
|
(interactive "p")
|
|
|
|
|
(if (eobp)
|
|
|
|
|
(insert
|
2009-02-12 05:38:25 +00:00
|
|
|
|
(with-current-buffer (cadr (buffer-list))
|
2004-07-01 09:54:51 +00:00
|
|
|
|
(buffer-substring-no-properties
|
|
|
|
|
(point) (progn (forward-char arg) (point)))))
|
|
|
|
|
(forward-char arg)))
|
|
|
|
|
|
|
|
|
|
(defun isearch-yank-char (&optional arg)
|
2014-01-07 04:36:52 +00:00
|
|
|
|
"Pull next character from buffer into search string.
|
|
|
|
|
If optional ARG is non-nil, pull in the next ARG characters."
|
2004-07-01 09:54:51 +00:00
|
|
|
|
(interactive "p")
|
|
|
|
|
(isearch-yank-internal (lambda () (forward-char arg) (point))))
|
2001-11-28 22:34:20 +00:00
|
|
|
|
|
2010-05-20 22:33:09 +00:00
|
|
|
|
(declare-function subword-forward "subword" (&optional arg))
|
2001-12-10 20:45:27 +00:00
|
|
|
|
(defun isearch-yank-word-or-char ()
|
2010-05-20 22:33:09 +00:00
|
|
|
|
"Pull next character, subword or word from buffer into search string.
|
|
|
|
|
Subword is used when `subword-mode' is activated. "
|
2001-12-10 20:45:27 +00:00
|
|
|
|
(interactive)
|
2001-12-19 22:48:02 +00:00
|
|
|
|
(isearch-yank-internal
|
2003-01-24 17:12:00 +00:00
|
|
|
|
(lambda ()
|
2001-12-19 22:48:02 +00:00
|
|
|
|
(if (or (= (char-syntax (or (char-after) 0)) ?w)
|
|
|
|
|
(= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
|
2014-09-04 16:14:26 +00:00
|
|
|
|
(if (or (and (boundp 'subword-mode) subword-mode)
|
|
|
|
|
(and (boundp 'superword-mode) superword-mode))
|
2010-05-20 22:33:09 +00:00
|
|
|
|
(subword-forward 1)
|
|
|
|
|
(forward-word 1))
|
2014-09-04 16:14:26 +00:00
|
|
|
|
(forward-char 1))
|
|
|
|
|
(point))))
|
2001-12-10 20:45:27 +00:00
|
|
|
|
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(defun isearch-yank-word (&optional arg)
|
2014-01-07 04:36:52 +00:00
|
|
|
|
"Pull next word from buffer into search string.
|
|
|
|
|
If optional ARG is non-nil, pull in the next ARG words."
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(interactive "p")
|
|
|
|
|
(isearch-yank-internal (lambda () (forward-word arg) (point))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(defun isearch-yank-line (&optional arg)
|
2014-01-07 04:36:52 +00:00
|
|
|
|
"Pull rest of line from buffer into search string.
|
|
|
|
|
If optional ARG is non-nil, yank the next ARG lines."
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(interactive "p")
|
2004-10-08 17:02:16 +00:00
|
|
|
|
(isearch-yank-internal
|
2006-07-09 11:04:19 +00:00
|
|
|
|
(lambda () (let ((inhibit-field-text-motion t))
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(line-end-position (if (eolp) (1+ arg) arg))))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(defun isearch-char-by-name (&optional count)
|
2013-05-15 23:21:01 +00:00
|
|
|
|
"Read a character by its Unicode name and add it to the search string.
|
2013-06-13 20:50:51 +00:00
|
|
|
|
Completion is available like in `read-char-by-name' used by `insert-char'.
|
|
|
|
|
With argument, add COUNT copies of the character."
|
|
|
|
|
(interactive "p")
|
2012-12-15 13:03:17 +00:00
|
|
|
|
(with-isearch-suspended
|
2013-05-15 23:21:01 +00:00
|
|
|
|
(let ((char (read-char-by-name "Add character to search (Unicode name or hex): ")))
|
2012-12-15 13:03:17 +00:00
|
|
|
|
(when char
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(let ((string (if (and (integerp count) (> count 1))
|
|
|
|
|
(make-string count char)
|
|
|
|
|
(char-to-string char))))
|
|
|
|
|
(setq isearch-new-string (concat isearch-string string)
|
|
|
|
|
isearch-new-message (concat isearch-message
|
|
|
|
|
(mapconcat 'isearch-text-char-description
|
|
|
|
|
string ""))))))))
|
2012-12-15 13:03:17 +00:00
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(defun isearch-search-and-update ()
|
|
|
|
|
;; Do the search and update the display.
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(when (or isearch-success
|
2004-04-29 15:28:55 +00:00
|
|
|
|
;; Unsuccessful regexp search may become successful by
|
|
|
|
|
;; addition of characters which make isearch-string valid
|
2002-11-07 17:46:04 +00:00
|
|
|
|
isearch-regexp
|
|
|
|
|
;; If the string was found but was completely invisible,
|
|
|
|
|
;; it might now be partly visible, so try again.
|
|
|
|
|
(prog1 isearch-hidden (setq isearch-hidden nil)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; 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 ()
|
1995-12-21 17:49:54 +00:00
|
|
|
|
(let ((case-fold-search isearch-case-fold-search))
|
1998-09-25 16:53:04 +00:00
|
|
|
|
(if (and (eq case-fold-search t) search-upper-case)
|
|
|
|
|
(setq case-fold-search
|
|
|
|
|
(isearch-no-upper-case-p isearch-string isearch-regexp)))
|
2011-12-02 10:19:49 +00:00
|
|
|
|
(looking-at (cond
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
((functionp isearch-regexp-function)
|
|
|
|
|
(funcall isearch-regexp-function isearch-string t))
|
|
|
|
|
(isearch-regexp-function (word-search-regexp isearch-string t))
|
2011-12-02 10:19:49 +00:00
|
|
|
|
(isearch-regexp isearch-string)
|
|
|
|
|
(t (regexp-quote isearch-string)))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(error nil))
|
1998-03-05 02:28:44 +00:00
|
|
|
|
(or isearch-yank-flag
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(<= (match-end 0)
|
1998-03-05 02:28:44 +00:00
|
|
|
|
(min isearch-opoint isearch-barrier))))
|
1997-06-25 03:45:38 +00:00
|
|
|
|
(progn
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(setq isearch-success t
|
2005-03-15 10:45:25 +00:00
|
|
|
|
isearch-error nil
|
1997-06-25 03:45:38 +00:00
|
|
|
|
isearch-other-end (match-end 0))
|
|
|
|
|
(if (and (eq isearch-case-fold-search t) search-upper-case)
|
|
|
|
|
(setq isearch-case-fold-search
|
|
|
|
|
(isearch-no-upper-case-p isearch-string isearch-regexp))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
;; Not regexp, not reverse, or no match at point.
|
2015-11-18 21:14:30 +00:00
|
|
|
|
;; Do the following before moving point.
|
|
|
|
|
(funcall (or isearch-message-function #'isearch-message) nil t)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(if (and isearch-other-end (not isearch-adjusted))
|
|
|
|
|
(goto-char (if isearch-forward isearch-other-end
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(min isearch-opoint
|
|
|
|
|
isearch-barrier
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(1+ isearch-other-end)))))
|
|
|
|
|
(isearch-search)
|
|
|
|
|
))
|
|
|
|
|
(isearch-push-state)
|
|
|
|
|
(if isearch-op-fun (funcall isearch-op-fun))
|
|
|
|
|
(isearch-update))
|
|
|
|
|
|
|
|
|
|
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
;; *, ?, }, 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
|
|
|
|
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
(defun isearch-backslash (str)
|
|
|
|
|
"Return t if STR ends in an odd number of backslashes."
|
|
|
|
|
(= (mod (- (length str) (string-match "\\\\*\\'" str)) 2) 1))
|
|
|
|
|
|
|
|
|
|
(defun isearch-fallback (want-backslash &optional allow-invalid to-barrier)
|
|
|
|
|
"Return point to previous successful match to allow regexp liberalization.
|
|
|
|
|
\\<isearch-mode-map>
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
Respects \\[isearch-repeat-forward] and \\[isearch-repeat-backward] by \
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
stopping at `isearch-barrier' as needed.
|
|
|
|
|
|
2005-07-18 14:32:30 +00:00
|
|
|
|
Do nothing if a backslash is escaping the liberalizing character.
|
|
|
|
|
If WANT-BACKSLASH is non-nil, invert this behavior (for \\} and \\|).
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
|
2005-07-18 14:32:30 +00:00
|
|
|
|
Do nothing if regexp has recently been invalid unless optional
|
|
|
|
|
ALLOW-INVALID non-nil.
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
|
2005-07-18 14:32:30 +00:00
|
|
|
|
If optional TO-BARRIER non-nil, ignore previous matches and go exactly
|
|
|
|
|
to the barrier."
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
;; (eq (not a) (not b)) makes all non-nil values equivalent
|
|
|
|
|
(when (and isearch-regexp (eq (not (isearch-backslash isearch-string))
|
|
|
|
|
(not want-backslash))
|
|
|
|
|
;; We have to check 2 stack frames because the last might be
|
|
|
|
|
;; invalid just because of a backslash.
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(or (not isearch-error)
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(not (isearch--state-error (cadr isearch-cmds)))
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
allow-invalid))
|
|
|
|
|
(if to-barrier
|
|
|
|
|
(progn (goto-char isearch-barrier)
|
|
|
|
|
(setq isearch-adjusted t))
|
|
|
|
|
(let* ((stack isearch-cmds)
|
|
|
|
|
(previous (cdr stack)) ; lookbelow in the stack
|
|
|
|
|
(frame (car stack)))
|
|
|
|
|
;; Walk down the stack looking for a valid regexp (as of course only
|
|
|
|
|
;; they can be the previous successful match); this conveniently
|
|
|
|
|
;; removes all bracket-sets and groups that might be in the way, as
|
|
|
|
|
;; well as partial \{\} constructs that the code below leaves behind.
|
|
|
|
|
;; Also skip over postfix operators -- though horrid,
|
2008-02-05 11:51:30 +00:00
|
|
|
|
;; 'ab?\{5,6\}+\{1,2\}*' is perfectly valid.
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
(while (and previous
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(or (isearch--state-error frame)
|
|
|
|
|
(let* ((string (isearch--state-string frame))
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
(lchar (aref string (1- (length string)))))
|
|
|
|
|
;; The operators aren't always operators; check
|
|
|
|
|
;; backslashes. This doesn't handle the case of
|
|
|
|
|
;; operators at the beginning of the regexp not
|
|
|
|
|
;; being special, but then we should fall back to
|
|
|
|
|
;; the barrier anyway because it's all optional.
|
|
|
|
|
(if (isearch-backslash
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(isearch--state-string (car previous)))
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
(eq lchar ?\})
|
|
|
|
|
(memq lchar '(?* ?? ?+))))))
|
|
|
|
|
(setq stack previous previous (cdr previous) frame (car stack)))
|
|
|
|
|
(when stack
|
|
|
|
|
;; `stack' now refers the most recent valid regexp that is not at
|
|
|
|
|
;; all optional in its last term. Now dig one level deeper and find
|
|
|
|
|
;; what matched before that.
|
2005-03-17 19:22:55 +00:00
|
|
|
|
(let ((last-other-end
|
|
|
|
|
(or (and (car previous)
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(isearch--state-other-end (car previous)))
|
2005-03-17 19:22:55 +00:00
|
|
|
|
isearch-barrier)))
|
Remove accidental changes of March 4. Fix backing
up when a regexp isearch is made more general. Use symbolic
accessor functions for isearch stack frames to make usage clearer.
(search-whitespace-regexp): Made groups in documentation shy (as
is the group in the default value).
(isearch-fallback): New function, addresses problems with regexps
liberalized by `\|', adds support for liberalization by `\}' (the
general repetition construct), and incorporates behavior for
`*'/`?'.
(isearch-}-char): New command, calls `isearch-fallback' with
arguments appropriate to a typed `}'.
(isearch-*-char, isearch-|-char): Now just call `isearch-fallback'
appropriately.
(isearch-mode-map): Bind `}' to `isearch-}-char'.
(isearch-string, isearch-message,string, isearch-point,
isearch-success, isearch-forward-flag, isearch-other-end,
isearch-word, isearch-invalid-regexp, isearch-wrapped,
isearch-barrier, isearch-within-brackets,
isearch-case-fold-search):
New inline functions to read fields of a stack frame.
2004-08-14 12:48:39 +00:00
|
|
|
|
(goto-char (if isearch-forward
|
|
|
|
|
(max last-other-end isearch-barrier)
|
|
|
|
|
(min last-other-end isearch-barrier)))
|
2005-07-18 14:32:30 +00:00
|
|
|
|
(setq isearch-adjusted t)))))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
;; scrolling within Isearch mode. Alan Mackenzie (acm@muc.de), 2003/2/24
|
|
|
|
|
;;
|
|
|
|
|
;; The idea here is that certain vertical scrolling commands (like C-l
|
|
|
|
|
;; `recenter') should be usable WITHIN Isearch mode. For a command to be
|
|
|
|
|
;; suitable, it must NOT alter the buffer, swap to another buffer or frame,
|
|
|
|
|
;; tamper with isearch's state, or move point. It is unacceptable for the
|
|
|
|
|
;; search string to be scrolled out of the current window. If a command
|
|
|
|
|
;; attempts this, we scroll the text back again.
|
|
|
|
|
;;
|
|
|
|
|
;; We implement this feature with a property called `isearch-scroll'.
|
2010-04-16 01:24:00 +00:00
|
|
|
|
;; If a command's symbol has the value t for this property or for the
|
|
|
|
|
;; `scroll-command' property, it is a scrolling command. The feature
|
|
|
|
|
;; needs to be enabled by setting the customizable variable
|
|
|
|
|
;; `isearch-allow-scroll' to a non-nil value.
|
2004-04-16 12:51:06 +00:00
|
|
|
|
;;
|
|
|
|
|
;; The universal argument commands (e.g. C-u) in simple.el are marked
|
|
|
|
|
;; as scrolling commands, and isearch.el has been amended to allow
|
|
|
|
|
;; prefix arguments to be passed through to scrolling commands. Thus
|
|
|
|
|
;; M-0 C-l will scroll point to the top of the window.
|
|
|
|
|
;;
|
|
|
|
|
;; Horizontal scrolling commands are currently not catered for.
|
|
|
|
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
|
|
|
|
|
|
|
|
;; Set the isearch-scroll property on some standard functions:
|
|
|
|
|
;; Scroll-bar functions:
|
|
|
|
|
(if (fboundp 'scroll-bar-toolkit-scroll)
|
|
|
|
|
(put 'scroll-bar-toolkit-scroll 'isearch-scroll t))
|
|
|
|
|
(if (fboundp 'w32-handle-scroll-bar-event)
|
|
|
|
|
(put 'w32-handle-scroll-bar-event 'isearch-scroll t))
|
|
|
|
|
|
2010-04-16 01:24:00 +00:00
|
|
|
|
;; Commands which scroll the window (some scroll commands
|
|
|
|
|
;; already have the `scroll-command' property on them):
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(put 'recenter 'isearch-scroll t)
|
2008-05-11 20:30:26 +00:00
|
|
|
|
(put 'recenter-top-bottom 'isearch-scroll t)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(put 'reposition-window 'isearch-scroll t)
|
|
|
|
|
|
|
|
|
|
;; Commands which act on the other window
|
|
|
|
|
(put 'list-buffers 'isearch-scroll t)
|
|
|
|
|
(put 'scroll-other-window 'isearch-scroll t)
|
|
|
|
|
(put 'scroll-other-window-down 'isearch-scroll t)
|
|
|
|
|
(put 'beginning-of-buffer-other-window 'isearch-scroll t)
|
|
|
|
|
(put 'end-of-buffer-other-window 'isearch-scroll t)
|
|
|
|
|
|
|
|
|
|
;; Commands which change the window layout
|
|
|
|
|
(put 'delete-other-windows 'isearch-scroll t)
|
|
|
|
|
(put 'balance-windows 'isearch-scroll t)
|
2011-10-30 01:56:03 +00:00
|
|
|
|
(put 'split-window-right 'isearch-scroll t)
|
|
|
|
|
(put 'split-window-below 'isearch-scroll t)
|
|
|
|
|
(put 'enlarge-window 'isearch-scroll t)
|
|
|
|
|
|
|
|
|
|
;; Aliases for split-window-*
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(put 'split-window-vertically 'isearch-scroll t)
|
2005-03-16 07:33:26 +00:00
|
|
|
|
(put 'split-window-horizontally 'isearch-scroll t)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
|
|
|
|
|
;; Universal argument commands
|
|
|
|
|
(put 'universal-argument 'isearch-scroll t)
|
2016-12-31 05:31:49 +00:00
|
|
|
|
(put 'universal-argument-more 'isearch-scroll t)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(put 'negative-argument 'isearch-scroll t)
|
|
|
|
|
(put 'digit-argument 'isearch-scroll t)
|
|
|
|
|
|
|
|
|
|
(defcustom isearch-allow-scroll nil
|
2010-01-22 16:32:31 +00:00
|
|
|
|
"Whether scrolling is allowed during incremental search.
|
|
|
|
|
If non-nil, scrolling commands can be used in Isearch mode.
|
|
|
|
|
However, the current match will never scroll offscreen.
|
2010-04-15 23:51:12 +00:00
|
|
|
|
If nil, scrolling commands will first cancel Isearch mode."
|
2004-04-16 12:51:06 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'isearch)
|
|
|
|
|
|
2013-06-05 20:57:09 +00:00
|
|
|
|
(defcustom isearch-allow-prefix t
|
|
|
|
|
"Whether prefix arguments are allowed during incremental search.
|
|
|
|
|
If non-nil, entering a prefix argument will not terminate the
|
|
|
|
|
search. This option is ignored \(presumed t) when
|
|
|
|
|
`isearch-allow-scroll' is set."
|
2013-06-06 06:23:19 +00:00
|
|
|
|
:version "24.4"
|
2013-06-05 20:57:09 +00:00
|
|
|
|
:type 'boolean
|
|
|
|
|
:group 'isearch)
|
|
|
|
|
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defun isearch-string-out-of-window (isearch-point)
|
|
|
|
|
"Test whether the search string is currently outside of the window.
|
|
|
|
|
Return nil if it's completely visible, or if point is visible,
|
|
|
|
|
together with as much of the search string as will fit; the symbol
|
|
|
|
|
`above' if we need to scroll the text downwards; the symbol `below',
|
|
|
|
|
if upwards."
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(let ((w-start (window-group-start))
|
|
|
|
|
(w-end (window-group-end nil t))
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
(w-L1 (save-excursion
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(save-selected-window (move-to-window-group-line 1) (point))))
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
(w-L-1 (save-excursion
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(save-selected-window (move-to-window-group-line -1) (point))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
start end) ; start and end of search string in buffer
|
|
|
|
|
(if isearch-forward
|
|
|
|
|
(setq end isearch-point start (or isearch-other-end isearch-point))
|
|
|
|
|
(setq start isearch-point end (or isearch-other-end isearch-point)))
|
|
|
|
|
(cond ((or (and (>= start w-start) (<= end w-end))
|
|
|
|
|
(if isearch-forward
|
|
|
|
|
(and (>= isearch-point w-L-1) (< isearch-point w-end)) ; point on Line -1
|
|
|
|
|
(and (>= isearch-point w-start) (< isearch-point w-L1)))) ; point on Line 0
|
|
|
|
|
nil)
|
|
|
|
|
((and (< start w-start)
|
|
|
|
|
(< isearch-point w-L-1))
|
|
|
|
|
'above)
|
|
|
|
|
(t 'below))))
|
|
|
|
|
|
|
|
|
|
(defun isearch-back-into-window (above isearch-point)
|
|
|
|
|
"Scroll the window to bring the search string back into view.
|
|
|
|
|
Restore point to ISEARCH-POINT in the process. ABOVE is t when the
|
|
|
|
|
search string is above the top of the window, nil when it is beneath
|
|
|
|
|
the bottom."
|
|
|
|
|
(let (start end)
|
|
|
|
|
(if isearch-forward
|
|
|
|
|
(setq end isearch-point start (or isearch-other-end isearch-point))
|
|
|
|
|
(setq start isearch-point end (or isearch-other-end isearch-point)))
|
|
|
|
|
(if above
|
|
|
|
|
(progn
|
|
|
|
|
(goto-char start)
|
2015-12-18 10:40:49 +00:00
|
|
|
|
(recenter-window-group 0)
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(when (>= isearch-point (window-group-end nil t))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(goto-char isearch-point)
|
2015-12-18 10:40:49 +00:00
|
|
|
|
(recenter-window-group -1)))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(goto-char end)
|
2015-12-18 10:40:49 +00:00
|
|
|
|
(recenter-window-group -1)
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(when (< isearch-point (window-group-start))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(goto-char isearch-point)
|
2015-12-18 10:40:49 +00:00
|
|
|
|
(recenter-window-group 0))))
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(goto-char isearch-point))
|
|
|
|
|
|
2013-10-08 23:20:12 +00:00
|
|
|
|
(defvar isearch-pre-scroll-point nil)
|
|
|
|
|
|
|
|
|
|
(defun isearch-pre-command-hook ()
|
|
|
|
|
"Decide whether to exit Isearch mode before executing the command.
|
|
|
|
|
Don't exit Isearch if the key sequence that invoked this command
|
|
|
|
|
is bound in `isearch-mode-map', or if the invoked command is
|
|
|
|
|
a prefix argument command (when `isearch-allow-prefix' is non-nil),
|
|
|
|
|
or it is a scrolling command (when `isearch-allow-scroll' is non-nil).
|
|
|
|
|
Otherwise, exit Isearch (when `search-exit-option' is non-nil)
|
|
|
|
|
before the command is executed globally with terminated Isearch."
|
2013-10-09 23:52:46 +00:00
|
|
|
|
(let* ((key (this-single-command-keys))
|
2013-10-08 23:20:12 +00:00
|
|
|
|
(main-event (aref key 0)))
|
|
|
|
|
(cond
|
2013-10-12 01:10:25 +00:00
|
|
|
|
;; Don't exit Isearch if we're in the middle of some
|
2013-12-23 03:59:10 +00:00
|
|
|
|
;; `set-transient-map' thingy like `universal-argument--mode'.
|
2013-12-06 00:55:20 +00:00
|
|
|
|
((not (eq overriding-terminal-local-map isearch--saved-overriding-local-map)))
|
2013-10-08 23:20:12 +00:00
|
|
|
|
;; Don't exit Isearch for isearch key bindings.
|
|
|
|
|
((commandp (lookup-key isearch-mode-map key nil)))
|
|
|
|
|
;; Optionally edit the search string instead of exiting.
|
|
|
|
|
((eq search-exit-option 'edit)
|
|
|
|
|
(setq this-command 'isearch-edit-string))
|
|
|
|
|
;; Handle a scrolling function or prefix argument.
|
|
|
|
|
((or (and isearch-allow-prefix
|
2016-12-31 05:31:49 +00:00
|
|
|
|
(memq this-command '(universal-argument universal-argument-more
|
2013-10-09 23:52:46 +00:00
|
|
|
|
digit-argument negative-argument)))
|
2013-10-08 23:20:12 +00:00
|
|
|
|
(and isearch-allow-scroll
|
2013-12-16 20:32:15 +00:00
|
|
|
|
(symbolp this-command)
|
2013-10-08 23:20:12 +00:00
|
|
|
|
(or (eq (get this-command 'isearch-scroll) t)
|
|
|
|
|
(eq (get this-command 'scroll-command) t))))
|
|
|
|
|
(when isearch-allow-scroll
|
|
|
|
|
(setq isearch-pre-scroll-point (point))))
|
|
|
|
|
;; A mouse click on the isearch message starts editing the search string.
|
|
|
|
|
((and (eq (car-safe main-event) 'down-mouse-1)
|
|
|
|
|
(window-minibuffer-p (posn-window (event-start main-event))))
|
|
|
|
|
;; Swallow the up-event.
|
|
|
|
|
(read-event)
|
|
|
|
|
(setq this-command 'isearch-edit-string))
|
|
|
|
|
;; Other characters terminate the search and are then executed normally.
|
|
|
|
|
(search-exit-option
|
|
|
|
|
(isearch-done)
|
|
|
|
|
(isearch-clean-overlays))
|
|
|
|
|
;; If search-exit-option is nil, run the command without exiting Isearch.
|
|
|
|
|
(t
|
|
|
|
|
(isearch-process-search-string key key)))))
|
|
|
|
|
|
|
|
|
|
(defun isearch-post-command-hook ()
|
|
|
|
|
(when isearch-pre-scroll-point
|
|
|
|
|
(let ((ab-bel (isearch-string-out-of-window isearch-pre-scroll-point)))
|
|
|
|
|
(if ab-bel
|
|
|
|
|
(isearch-back-into-window (eq ab-bel 'above) isearch-pre-scroll-point)
|
|
|
|
|
(goto-char isearch-pre-scroll-point)))
|
|
|
|
|
(setq isearch-pre-scroll-point nil)
|
|
|
|
|
(isearch-update)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(defun isearch-quote-char (&optional count)
|
|
|
|
|
"Quote special characters for incremental search.
|
|
|
|
|
With argument, add COUNT copies of the character."
|
|
|
|
|
(interactive "p")
|
1997-08-04 19:03:37 +00:00
|
|
|
|
(let ((char (read-quoted-char (isearch-message t))))
|
2014-02-08 10:20:45 +00:00
|
|
|
|
(unless (characterp char)
|
|
|
|
|
(user-error "%s is not a valid character"
|
|
|
|
|
(key-description (vector char))))
|
1999-07-03 19:45:04 +00:00
|
|
|
|
;; Assume character codes 0200 - 0377 stand for characters in some
|
1999-05-28 00:16:09 +00:00
|
|
|
|
;; single-byte character set, and convert them to Emacs
|
|
|
|
|
;; characters.
|
2012-09-02 09:31:45 +00:00
|
|
|
|
(if (and isearch-regexp isearch-regexp-lax-whitespace (= char ?\s))
|
2004-12-08 01:38:05 +00:00
|
|
|
|
(if (subregexp-context-p isearch-string (length isearch-string))
|
2004-12-06 15:12:08 +00:00
|
|
|
|
(isearch-process-search-string "[ ]" " ")
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(isearch-process-search-char char count))
|
2013-08-27 15:57:16 +00:00
|
|
|
|
;; This used to assume character codes 0240 - 0377 stand for
|
|
|
|
|
;; characters in some single-byte character set, and converted them
|
|
|
|
|
;; to Emacs characters. But in 23.1 this feature is deprecated
|
|
|
|
|
;; in favor of inserting the corresponding Unicode characters.
|
|
|
|
|
;; (and enable-multibyte-characters
|
|
|
|
|
;; (>= char ?\200)
|
|
|
|
|
;; (<= char ?\377)
|
|
|
|
|
;; (setq char (unibyte-char-to-multibyte char)))
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(isearch-process-search-char char count))))
|
|
|
|
|
|
|
|
|
|
(defun isearch-printing-char (&optional char count)
|
|
|
|
|
"Add this ordinary printing CHAR to the search string and search.
|
|
|
|
|
With argument, add COUNT copies of the character."
|
|
|
|
|
(interactive (list last-command-event
|
|
|
|
|
(prefix-numeric-value current-prefix-arg)))
|
|
|
|
|
(let ((char (or char last-command-event)))
|
1997-10-15 23:15:09 +00:00
|
|
|
|
(if (= char ?\S-\ )
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
(setq char ?\s))
|
2008-02-28 01:58:07 +00:00
|
|
|
|
(if current-input-method
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(isearch-process-search-multibyte-characters char count)
|
|
|
|
|
(isearch-process-search-char char count))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2013-06-13 20:50:51 +00:00
|
|
|
|
(defun isearch-process-search-char (char &optional count)
|
2015-01-27 13:39:27 +00:00
|
|
|
|
"Add CHAR to the search string, COUNT times.
|
|
|
|
|
Search is updated accordingly."
|
2005-07-18 14:32:30 +00:00
|
|
|
|
;; * and ? are special in regexps when not preceded by \.
|
|
|
|
|
;; } and | are special in regexps when preceded by \.
|
|
|
|
|
;; Nothing special for + because it matches at least once.
|
|
|
|
|
(cond
|
|
|
|
|
((memq char '(?* ??)) (isearch-fallback nil))
|
|
|
|
|
((eq char ?\}) (isearch-fallback t t))
|
|
|
|
|
((eq char ?|) (isearch-fallback t nil t)))
|
|
|
|
|
|
2013-06-13 20:50:51 +00:00
|
|
|
|
;; Append the char(s) to the search string,
|
|
|
|
|
;; update the message and re-search.
|
|
|
|
|
(let* ((string (if (and (integerp count) (> count 1))
|
|
|
|
|
(make-string count char)
|
|
|
|
|
(char-to-string char)))
|
|
|
|
|
(message (if (>= char ?\200)
|
|
|
|
|
string
|
|
|
|
|
(mapconcat 'isearch-text-char-description string ""))))
|
|
|
|
|
(isearch-process-search-string string message)))
|
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
|
2011-08-24 09:40:58 +00:00
|
|
|
|
(mod (+ (or yank-pointer (if advance 0 -1))
|
1993-08-10 04:14:17 +00:00
|
|
|
|
(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
|
|
|
|
|
(isearch-ring-adjust1 advance)
|
|
|
|
|
(if search-ring-update
|
|
|
|
|
(progn
|
2015-11-18 21:14:30 +00:00
|
|
|
|
(funcall (or isearch-message-function #'isearch-message) nil t)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(isearch-search)
|
2008-03-14 01:02:45 +00:00
|
|
|
|
(isearch-push-state)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(isearch-update))
|
2008-03-14 01:02:45 +00:00
|
|
|
|
;; Otherwise, edit the search string instead. Note that there is
|
|
|
|
|
;; no need to push the search state after isearch-edit-string here
|
|
|
|
|
;; since isearch-edit-string already pushes its state
|
|
|
|
|
(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-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))
|
|
|
|
|
(completion-ignore-case case-fold-search)
|
2003-04-29 20:38:53 +00:00
|
|
|
|
(completion (try-completion isearch-string ring)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(cond
|
|
|
|
|
((eq completion t)
|
|
|
|
|
;; isearch-string stays the same
|
|
|
|
|
t)
|
|
|
|
|
((or completion ; not nil, must be a string
|
1996-01-04 23:42:23 +00:00
|
|
|
|
(= 0 (length isearch-string))) ; shouldn't have to say this
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if (equal completion isearch-string) ;; no extension?
|
1996-11-12 04:26:06 +00:00
|
|
|
|
(progn
|
|
|
|
|
(if completion-auto-help
|
|
|
|
|
(with-output-to-temp-buffer "*Isearch completions*"
|
2003-01-24 17:12:00 +00:00
|
|
|
|
(display-completion-list
|
2003-04-29 20:38:53 +00:00
|
|
|
|
(all-completions isearch-string ring))))
|
1996-11-12 04:26:06 +00:00
|
|
|
|
t)
|
|
|
|
|
(and completion
|
|
|
|
|
(setq isearch-string completion))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(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)
|
2003-05-03 13:49:47 +00:00
|
|
|
|
(progn (setq isearch-message
|
|
|
|
|
(mapconcat 'isearch-text-char-description
|
|
|
|
|
isearch-string ""))
|
|
|
|
|
(isearch-edit-string))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
;; 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)
|
2003-04-29 20:38:53 +00:00
|
|
|
|
(setq isearch-string (field-string))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if (isearch-complete1)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(progn
|
1999-11-04 20:43:05 +00:00
|
|
|
|
(delete-field)
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(insert isearch-string))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; Message string
|
|
|
|
|
|
|
|
|
|
(defun isearch-message (&optional c-q-hack ellipsis)
|
|
|
|
|
;; Generate and print the message string.
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
|
|
|
|
|
;; N.B.: This function should always be called with point at the
|
|
|
|
|
;; search point, because in certain (rare) circumstances, undesired
|
|
|
|
|
;; scrolling can happen when point is elsewhere. These
|
|
|
|
|
;; circumstances are when follow-mode is active, the search string
|
|
|
|
|
;; spans two (or several) windows, and the message about to be
|
|
|
|
|
;; displayed will cause the echo area to expand.
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(let ((cursor-in-echo-area ellipsis)
|
2008-02-25 00:01:54 +00:00
|
|
|
|
(m isearch-message)
|
2011-09-14 16:07:42 +00:00
|
|
|
|
(fail-pos (isearch-fail-pos t)))
|
|
|
|
|
;; Highlight failed part
|
|
|
|
|
(when fail-pos
|
|
|
|
|
(setq m (copy-sequence m))
|
|
|
|
|
(add-text-properties fail-pos (length m) '(face isearch-fail) m)
|
2008-02-25 00:01:54 +00:00
|
|
|
|
;; Highlight failed trailing whitespace
|
|
|
|
|
(when (string-match " +$" m)
|
|
|
|
|
(add-text-properties (match-beginning 0) (match-end 0)
|
|
|
|
|
'(face trailing-whitespace) m)))
|
|
|
|
|
(setq m (concat
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(isearch-message-prefix ellipsis isearch-nonincremental)
|
2008-02-25 00:01:54 +00:00
|
|
|
|
m
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(isearch-message-suffix c-q-hack)))
|
2008-02-25 00:01:54 +00:00
|
|
|
|
(if c-q-hack m (let ((message-log-max nil)) (message "%s" m)))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(defun isearch--describe-regexp-mode (regexp-function &optional space-before)
|
|
|
|
|
"Make a string for describing REGEXP-FUNCTION.
|
|
|
|
|
If SPACE-BEFORE is non-nil, put a space before, instead of after,
|
2015-07-05 00:10:55 +00:00
|
|
|
|
the word mode."
|
2015-10-26 00:51:02 +00:00
|
|
|
|
(when (eq regexp-function t)
|
|
|
|
|
(setq regexp-function #'word-search-regexp))
|
2015-07-05 00:10:55 +00:00
|
|
|
|
(let ((description
|
2016-03-14 18:15:17 +00:00
|
|
|
|
(cond
|
|
|
|
|
;; 1. Do not use a description on the default search mode,
|
|
|
|
|
;; but only if the default search mode is non-nil.
|
|
|
|
|
((or (and search-default-mode
|
|
|
|
|
(equal search-default-mode regexp-function))
|
|
|
|
|
;; Special case where `search-default-mode' is t
|
|
|
|
|
;; (defaults to regexp searches).
|
|
|
|
|
(and (eq search-default-mode t)
|
|
|
|
|
(eq search-default-mode isearch-regexp))) "")
|
|
|
|
|
;; 2. Use the `isearch-message-prefix' set for
|
|
|
|
|
;; `regexp-function' if available.
|
2016-03-21 23:28:27 +00:00
|
|
|
|
(regexp-function
|
|
|
|
|
(and (symbolp regexp-function)
|
|
|
|
|
(or (get regexp-function 'isearch-message-prefix)
|
|
|
|
|
"")))
|
2016-03-14 18:15:17 +00:00
|
|
|
|
;; 3. Else if `isearch-regexp' is non-nil, set description
|
|
|
|
|
;; to "regexp ".
|
2016-03-21 23:28:27 +00:00
|
|
|
|
(isearch-regexp "regexp ")
|
|
|
|
|
;; 4. Else if we're in literal mode (and if the default
|
|
|
|
|
;; mode is also not literal), describe it.
|
|
|
|
|
((functionp search-default-mode) "literal ")
|
|
|
|
|
;; 5. And finally, if none of the above is true, set the
|
|
|
|
|
;; description to an empty string.
|
|
|
|
|
(t ""))))
|
2015-07-05 00:10:55 +00:00
|
|
|
|
(if space-before
|
|
|
|
|
;; Move space from the end to the beginning.
|
|
|
|
|
(replace-regexp-in-string "\\(.*\\) \\'" " \\1" description)
|
|
|
|
|
description)))
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(define-obsolete-function-alias 'isearch--describe-word-mode
|
|
|
|
|
'isearch--describe-regexp-mode "25.1")
|
2015-07-05 00:10:55 +00:00
|
|
|
|
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(defun isearch-message-prefix (&optional 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.
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(and isearch-error ellipsis
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(condition-case ()
|
|
|
|
|
(progn (re-search-forward isearch-string (point) t)
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(setq isearch-error nil))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(error nil)))
|
|
|
|
|
;; If currently failing, display no ellipsis.
|
|
|
|
|
(or isearch-success (setq ellipsis nil))
|
|
|
|
|
(let ((m (concat (if isearch-success "" "failing ")
|
2004-09-03 20:32:57 +00:00
|
|
|
|
(if isearch-adjusted "pending " "")
|
1995-10-19 22:23:57 +00:00
|
|
|
|
(if (and isearch-wrapped
|
2004-09-01 20:35:12 +00:00
|
|
|
|
(not isearch-wrap-function)
|
1995-10-19 22:23:57 +00:00
|
|
|
|
(if isearch-forward
|
|
|
|
|
(> (point) isearch-opoint)
|
|
|
|
|
(< (point) isearch-opoint)))
|
|
|
|
|
"over")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(if isearch-wrapped "wrapped ")
|
2013-08-05 18:05:46 +00:00
|
|
|
|
(let ((prefix ""))
|
|
|
|
|
(advice-function-mapc
|
|
|
|
|
(lambda (_ props)
|
|
|
|
|
(let ((np (cdr (assq 'isearch-message-prefix props))))
|
|
|
|
|
(if np (setq prefix (concat np prefix)))))
|
|
|
|
|
isearch-filter-predicate)
|
2015-07-05 00:10:55 +00:00
|
|
|
|
prefix)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(isearch--describe-regexp-mode isearch-regexp-function)
|
2014-11-09 19:19:54 +00:00
|
|
|
|
(cond
|
|
|
|
|
(multi-isearch-file-list "multi-file ")
|
|
|
|
|
(multi-isearch-buffer-list "multi-buffer ")
|
|
|
|
|
(t ""))
|
2008-11-11 20:11:34 +00:00
|
|
|
|
(or isearch-message-prefix-add "")
|
1992-09-14 22:31:47 +00:00
|
|
|
|
(if nonincremental "search" "I-search")
|
1997-02-20 05:46:22 +00:00
|
|
|
|
(if isearch-forward "" " backward")
|
1997-08-18 10:53:05 +00:00
|
|
|
|
(if current-input-method
|
2011-12-02 10:35:17 +00:00
|
|
|
|
;; Input methods for RTL languages use RTL
|
|
|
|
|
;; characters for their title, and that messes
|
2011-12-02 10:37:53 +00:00
|
|
|
|
;; up the display of search text after the prompt.
|
2011-12-02 10:35:17 +00:00
|
|
|
|
(bidi-string-mark-left-to-right
|
|
|
|
|
(concat " [" current-input-method-title "]: "))
|
1997-02-20 05:46:22 +00:00
|
|
|
|
": ")
|
1992-06-24 05:05:16 +00:00
|
|
|
|
)))
|
2007-03-06 09:19:54 +00:00
|
|
|
|
(propertize (concat (upcase (substring m 0 1)) (substring m 1))
|
|
|
|
|
'face 'minibuffer-prompt)))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(defun isearch-message-suffix (&optional c-q-hack)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(concat (if c-q-hack "^Q" "")
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(if isearch-error
|
|
|
|
|
(concat " [" isearch-error "]")
|
2008-11-11 20:11:34 +00:00
|
|
|
|
"")
|
|
|
|
|
(or isearch-message-suffix-add "")))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Searching
|
|
|
|
|
|
2012-05-29 09:09:38 +00:00
|
|
|
|
(defvar isearch-search-fun-function 'isearch-search-fun-default
|
|
|
|
|
"Non-default value overrides the behavior of `isearch-search-fun-default'.
|
2011-07-04 12:15:16 +00:00
|
|
|
|
This variable's value should be a function, which will be called
|
|
|
|
|
with no arguments, and should return a function that takes three
|
2016-04-30 22:16:42 +00:00
|
|
|
|
arguments: STRING, BOUND, and NOERROR. STRING is the string to
|
|
|
|
|
be searched for. See `re-search-forward' for the meaning of
|
|
|
|
|
BOUND and NOERROR arguments.
|
2011-07-04 12:15:16 +00:00
|
|
|
|
|
|
|
|
|
This returned function will be used by `isearch-search-string' to
|
2016-01-20 13:09:09 +00:00
|
|
|
|
search for the first occurrence of STRING.")
|
2002-09-09 21:05:22 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-search-fun ()
|
|
|
|
|
"Return the function to use for the search.
|
|
|
|
|
Can be changed via `isearch-search-fun-function' for special needs."
|
2012-05-29 09:09:38 +00:00
|
|
|
|
(funcall (or isearch-search-fun-function 'isearch-search-fun-default)))
|
|
|
|
|
|
2015-10-21 16:27:23 +00:00
|
|
|
|
(defun isearch--lax-regexp-function-p ()
|
|
|
|
|
"Non-nil if next regexp-function call should be lax."
|
|
|
|
|
(not (or isearch-nonincremental
|
|
|
|
|
(null (car isearch-cmds))
|
|
|
|
|
(eq (length isearch-string)
|
|
|
|
|
(length (isearch--state-string
|
|
|
|
|
(car isearch-cmds)))))))
|
|
|
|
|
|
2012-05-29 09:09:38 +00:00
|
|
|
|
(defun isearch-search-fun-default ()
|
|
|
|
|
"Return default functions to use for the search."
|
2015-10-21 16:27:23 +00:00
|
|
|
|
(lambda (string &optional bound noerror count)
|
|
|
|
|
;; Use lax versions to not fail at the end of the word while
|
|
|
|
|
;; the user adds and removes characters in the search string
|
|
|
|
|
;; (or when using nonincremental word isearch)
|
|
|
|
|
(let ((search-spaces-regexp (when (cond
|
|
|
|
|
(isearch-regexp isearch-regexp-lax-whitespace)
|
|
|
|
|
(t isearch-lax-whitespace))
|
|
|
|
|
search-whitespace-regexp)))
|
2015-11-29 22:04:33 +00:00
|
|
|
|
(condition-case er
|
|
|
|
|
(funcall
|
|
|
|
|
(if isearch-forward #'re-search-forward #'re-search-backward)
|
|
|
|
|
(cond (isearch-regexp-function
|
2017-02-09 22:35:22 +00:00
|
|
|
|
(let ((lax (and (not bound) (isearch--lax-regexp-function-p))))
|
|
|
|
|
(when lax
|
|
|
|
|
(setq isearch-adjusted t))
|
2015-11-29 22:04:33 +00:00
|
|
|
|
(if (functionp isearch-regexp-function)
|
|
|
|
|
(funcall isearch-regexp-function string lax)
|
|
|
|
|
(word-search-regexp string lax))))
|
|
|
|
|
(isearch-regexp string)
|
|
|
|
|
(t (regexp-quote string)))
|
|
|
|
|
bound noerror count)
|
|
|
|
|
(search-failed
|
|
|
|
|
(signal (car er)
|
|
|
|
|
(let ((prefix (get isearch-regexp-function 'isearch-message-prefix)))
|
|
|
|
|
(if (and isearch-regexp-function (stringp prefix))
|
|
|
|
|
(list (format "%s [using %ssearch]" string prefix))
|
|
|
|
|
(cdr er)))))))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
2006-09-20 06:13:43 +00:00
|
|
|
|
(defun isearch-search-string (string bound noerror)
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
"Search for the first occurrence of STRING or its translation.
|
2016-01-20 13:09:09 +00:00
|
|
|
|
STRING's characters are translated using `translation-table-for-input'
|
|
|
|
|
if that is non-nil.
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
If found, move point to the end of the occurrence,
|
2016-01-20 13:09:09 +00:00
|
|
|
|
update the match data, and return point.
|
|
|
|
|
An optional second argument bounds the search; it is a buffer position.
|
|
|
|
|
The match found must not extend after that position.
|
|
|
|
|
Optional third argument, if t, means if fail just return nil (no error).
|
|
|
|
|
If not nil and not t, move to limit of search and return nil."
|
2008-11-21 05:32:07 +00:00
|
|
|
|
(let* ((func (isearch-search-fun))
|
|
|
|
|
(pos1 (save-excursion (funcall func string bound noerror)))
|
|
|
|
|
pos2)
|
2009-02-14 09:04:46 +00:00
|
|
|
|
(when (and
|
|
|
|
|
;; Avoid "obsolete" warnings for translation-table-for-input.
|
|
|
|
|
(with-no-warnings
|
|
|
|
|
(char-table-p translation-table-for-input))
|
|
|
|
|
(multibyte-string-p string)
|
|
|
|
|
;; Minor optimization.
|
|
|
|
|
(string-match-p "[^[:ascii:]]" string))
|
2008-11-21 05:32:07 +00:00
|
|
|
|
(let ((translated
|
|
|
|
|
(apply 'string
|
|
|
|
|
(mapcar (lambda (c)
|
2009-02-14 09:04:46 +00:00
|
|
|
|
(or
|
|
|
|
|
;; Avoid "obsolete" warnings for
|
|
|
|
|
;; translation-table-for-input.
|
|
|
|
|
(with-no-warnings
|
|
|
|
|
(aref translation-table-for-input c))
|
|
|
|
|
c))
|
2008-11-21 05:32:07 +00:00
|
|
|
|
string)))
|
|
|
|
|
match-data)
|
|
|
|
|
(when translated
|
|
|
|
|
(save-match-data
|
|
|
|
|
(save-excursion
|
|
|
|
|
(if (setq pos2 (funcall func translated bound noerror))
|
|
|
|
|
(setq match-data (match-data t)))))
|
|
|
|
|
(when (and pos2
|
|
|
|
|
(or (not pos1)
|
|
|
|
|
(if isearch-forward (< pos2 pos1) (> pos2 pos1))))
|
|
|
|
|
(setq pos1 pos2)
|
|
|
|
|
(set-match-data match-data)))))
|
2007-10-22 23:44:29 +00:00
|
|
|
|
(when pos1
|
|
|
|
|
;; When using multiple buffers isearch, switch to the new buffer here,
|
|
|
|
|
;; because `save-excursion' above doesn't allow doing it inside funcall.
|
2008-07-23 23:51:15 +00:00
|
|
|
|
(if (and multi-isearch-next-buffer-current-function
|
|
|
|
|
(buffer-live-p multi-isearch-current-buffer))
|
|
|
|
|
(switch-to-buffer multi-isearch-current-buffer))
|
2008-11-21 05:32:07 +00:00
|
|
|
|
(goto-char pos1)
|
|
|
|
|
pos1)))
|
2006-09-20 06:13:43 +00:00
|
|
|
|
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(defun isearch-search ()
|
|
|
|
|
;; Do the search with the current search string.
|
1994-05-03 08:27:40 +00:00
|
|
|
|
(if (and (eq isearch-case-fold-search t) 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
|
2013-05-30 23:45:41 +00:00
|
|
|
|
(let ((inhibit-point-motion-hooks isearch-invisible)
|
1997-07-19 05:34:23 +00:00
|
|
|
|
(inhibit-quit nil)
|
1997-02-10 09:41:31 +00:00
|
|
|
|
(case-fold-search isearch-case-fold-search)
|
2013-05-30 23:45:41 +00:00
|
|
|
|
(search-invisible isearch-invisible)
|
1997-02-10 09:41:31 +00:00
|
|
|
|
(retry t))
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(setq isearch-error nil)
|
1997-02-10 09:41:31 +00:00
|
|
|
|
(while retry
|
|
|
|
|
(setq isearch-success
|
2006-09-20 06:13:43 +00:00
|
|
|
|
(isearch-search-string isearch-string nil t))
|
2008-11-17 00:42:46 +00:00
|
|
|
|
;; Clear RETRY unless the search predicate says
|
|
|
|
|
;; to skip this search hit.
|
2008-04-22 19:56:17 +00:00
|
|
|
|
(if (or (not isearch-success)
|
1997-02-10 09:41:31 +00:00
|
|
|
|
(bobp) (eobp)
|
|
|
|
|
(= (match-beginning 0) (match-end 0))
|
2013-08-05 18:05:46 +00:00
|
|
|
|
(funcall isearch-filter-predicate
|
|
|
|
|
(match-beginning 0) (match-end 0)))
|
1997-02-10 09:41:31 +00:00
|
|
|
|
(setq retry nil)))
|
1995-12-21 17:49:54 +00:00
|
|
|
|
(setq isearch-just-started nil)
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(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))
|
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(invalid-regexp
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(setq isearch-error (car (cdr lossage)))
|
2013-08-28 16:33:02 +00:00
|
|
|
|
(cond
|
|
|
|
|
((string-match
|
|
|
|
|
"\\`Premature \\|\\`Unmatched \\|\\`Invalid "
|
|
|
|
|
isearch-error)
|
|
|
|
|
(setq isearch-error "incomplete input"))
|
|
|
|
|
((and (not isearch-regexp)
|
|
|
|
|
(string-match "\\`Regular expression too big" isearch-error))
|
|
|
|
|
(cond
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(isearch-regexp-function
|
2013-08-28 16:33:02 +00:00
|
|
|
|
(setq isearch-error "Too many words"))
|
|
|
|
|
((and isearch-lax-whitespace search-whitespace-regexp)
|
|
|
|
|
(setq isearch-error "Too many spaces for whitespace matching"))))))
|
2005-03-15 10:45:25 +00:00
|
|
|
|
|
|
|
|
|
(search-failed
|
|
|
|
|
(setq isearch-success nil)
|
|
|
|
|
(setq isearch-error (nth 2 lossage)))
|
|
|
|
|
|
1992-11-01 22:10:59 +00:00
|
|
|
|
(error
|
2001-01-17 14:10:25 +00:00
|
|
|
|
;; stack overflow in regexp search.
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(setq isearch-error (format "%s" lossage))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
|
|
|
|
(if isearch-success
|
|
|
|
|
nil
|
|
|
|
|
;; Ding if failed this time after succeeding last time.
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(and (isearch--state-success (car isearch-cmds))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
(ding))
|
2012-08-04 22:31:04 +00:00
|
|
|
|
(if (functionp (isearch--state-pop-fun (car isearch-cmds)))
|
|
|
|
|
(funcall (isearch--state-pop-fun (car isearch-cmds))
|
|
|
|
|
(car isearch-cmds)))
|
|
|
|
|
(goto-char (isearch--state-point (car isearch-cmds)))))
|
1992-06-24 05:05:16 +00:00
|
|
|
|
|
1997-06-13 21:30:38 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Called when opening an overlay, and we are still in isearch.
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(defun isearch-open-overlay-temporary (ov)
|
2003-01-24 17:12:00 +00:00
|
|
|
|
(if (not (null (overlay-get ov 'isearch-open-invisible-temporary)))
|
1997-06-13 21:30:38 +00:00
|
|
|
|
;; 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)
|
Deprecate `intangible' and `point-entered' properties
* lisp/emacs-lisp/cursor-sensor.el: New file.
* lisp/simple.el (pre-redisplay-functions): New hook.
(redisplay--pre-redisplay-functions): New function.
(pre-redisplay-function): Use it.
(minibuffer-avoid-prompt): Mark obsolete.
(redisplay--update-region-highlight): Adapt it to work as a function on
pre-redisplay-functions.
* lisp/cus-start.el (minibuffer-prompt-properties--setter): New fun.
(minibuffer-prompt-properties): Use it. Use cursor-intangible rather
than point-entered to make the prompt intangible.
* lisp/forms.el: Move `provide' calls to the end.
(forms-mode): Don't use `run-hooks' on a local var.
(forms--make-format, forms--make-format-elt-using-text-properties):
Use cursor-intangible rather than `intangible'.
(forms-mode): Enable cursor-intangible-mode.
* lisp/isearch.el (isearch-mode): Use defvar-local.
(cursor-sensor-inhibit): Declare.
(isearch-mode): Set cursor-sensor-inhibit.
(isearch-done): Set it back.
(isearch-open-overlay-temporary, isearch-open-necessary-overlays)
(isearch-close-unnecessary-overlays): Don't bother with `intangible'
any more.
* lisp/ses.el (ses-localvars): Remove `mode-line-process'.
(ses-sym-rowcol, ses-cell-value, ses-col-width, ses-col-printer):
Add Edebug spec.
(ses-goto-print, ses-print-cell, ses-adjust-print-width)
(ses-goto-data, ses-setup, ses-copy-region): Don't let-bind
inhibit-point-motion-hooks any more.
(ses--cell-at-pos, ses--curcell): New functions, extracted from
ses-set-curcell.
(ses-set-curcell): Use them.
(ses-print-cell, ses-setup): Use cursor-intangible instead of
`intangible'. Make sure cursor-intangible isn't sticky at BOB.
(ses-print-cell-new-width, ses-reprint-all, ses-recalculate-all):
Use ses--cell-at-pos.
(ses--mode-line-process, ses--cursor-sensor-highlight): New functions,
extracted from ses-command-hook. Make them work with multiple windows
displaying the same buffer.
(ses-mode): Use them via mode-line-process and pre-redisplay-functions.
Enable cursor-intangible-mode.
(ses-command-hook): Remove cell highlight and mode-line update code.
(ses-forward-or-insert, ses-copy-region-helper, ses-sort-column):
Update for new name of text-property holding the cell name.
(ses-rename-cell): Don't mess with mode-line-process.
* lisp/erc/erc-stamp.el (erc-add-timestamp): Use the new
cursor-sensor-functions property instead of point-entered.
(erc-insert-timestamp-right, erc-format-timestamp):
Use cursor-intangible rather than `intangible'.
(erc-munge-invisibility-spec): Use add-to-invisibility-spec and
remove-from-invisibility-spec. Enable cursor-intangible-mode and
cursor-sensor-mode if needed.
(erc-echo-timestamp): Adapt to calling convention of
cursor-sensor-functions.
(erc-insert-timestamp-right): Remove unused vars `current-window' and
`indent'.
* lisp/gnus/gnus-group.el (gnus-tmp-*): Declare.
(gnus-update-group-mark-positions): Remove unused `topic' var.
(gnus-group-insert-group-line): Remove unused var `header'.
(gnus-group--setup-tool-bar-update): New function.
(gnus-group-insert-group-line): Use it.
(gnus-group-update-eval-form): Declare local
dynamically-bound variables.
(gnus-group-unsubscribe-group): Use \` and \' to match string bounds.
* lisp/gnus/gnus-topic.el (gnus-topic-jump-to-topic)
(gnus-group-prepare-topics, gnus-topic-update-topic)
(gnus-topic-change-level, gnus-topic-catchup-articles)
(gnus-topic-remove-group, gnus-topic-delete, gnus-topic-indent):
Use inhibit-read-only.
(gnus-topic-prepare-topic): Use gnus-group--setup-tool-bar-update.
(gnus-topic-mode): Use define-minor-mode and derived-mode-p.
* lisp/textmodes/reftex-index.el (reftex-display-index):
Use cursor-intangible-mode if available.
(reftex-index-post-command-hook): Check cursor-intangible.
* lisp/textmodes/reftex-toc.el (reftex-toc):
Use cursor-intangible-mode if available.
(reftex-toc-recenter, reftex-toc-post-command-hook):
Check cursor-intangible.
* lisp/textmodes/sgml-mode.el: Use lexical-binding.
(sgml-tag): Use cursor-sensor-functions instead of point-entered.
(sgml-tags-invisible): Use with-silent-modifications and
inhibit-read-only. Enable cursor-sensor-mode.
(sgml-cursor-sensor): Rename from sgml-point-entered and adjust to
calling convention of cursor-sensor-functions.
* lisp/textmodes/table.el (table-cell-map-hook, table-load-hook)
(table-point-entered-cell-hook, table-point-left-cell-hook):
Don't autoload.
(table-cell-entered-state): Remove var.
(table--put-cell-point-entered/left-property)
(table--remove-cell-properties):
Use cursor-sensor-functions rather than point-entered/left.
(table--point-entered/left-cell-function): Merge
table--point-entered-cell-function and table--point-left-cell-function
and adjust to calling convention of cursor-sensor-functions.
2015-04-13 19:51:15 +00:00
|
|
|
|
;; Store the values for the `invisible' property, and then set it to nil.
|
|
|
|
|
;; This way the text hidden by this overlay becomes visible.
|
1997-06-13 21:30:38 +00:00
|
|
|
|
|
|
|
|
|
;; In 19.34 this does not exist so I cannot test it.
|
|
|
|
|
(overlay-put ov 'isearch-invisible (overlay-get ov 'invisible))
|
Deprecate `intangible' and `point-entered' properties
* lisp/emacs-lisp/cursor-sensor.el: New file.
* lisp/simple.el (pre-redisplay-functions): New hook.
(redisplay--pre-redisplay-functions): New function.
(pre-redisplay-function): Use it.
(minibuffer-avoid-prompt): Mark obsolete.
(redisplay--update-region-highlight): Adapt it to work as a function on
pre-redisplay-functions.
* lisp/cus-start.el (minibuffer-prompt-properties--setter): New fun.
(minibuffer-prompt-properties): Use it. Use cursor-intangible rather
than point-entered to make the prompt intangible.
* lisp/forms.el: Move `provide' calls to the end.
(forms-mode): Don't use `run-hooks' on a local var.
(forms--make-format, forms--make-format-elt-using-text-properties):
Use cursor-intangible rather than `intangible'.
(forms-mode): Enable cursor-intangible-mode.
* lisp/isearch.el (isearch-mode): Use defvar-local.
(cursor-sensor-inhibit): Declare.
(isearch-mode): Set cursor-sensor-inhibit.
(isearch-done): Set it back.
(isearch-open-overlay-temporary, isearch-open-necessary-overlays)
(isearch-close-unnecessary-overlays): Don't bother with `intangible'
any more.
* lisp/ses.el (ses-localvars): Remove `mode-line-process'.
(ses-sym-rowcol, ses-cell-value, ses-col-width, ses-col-printer):
Add Edebug spec.
(ses-goto-print, ses-print-cell, ses-adjust-print-width)
(ses-goto-data, ses-setup, ses-copy-region): Don't let-bind
inhibit-point-motion-hooks any more.
(ses--cell-at-pos, ses--curcell): New functions, extracted from
ses-set-curcell.
(ses-set-curcell): Use them.
(ses-print-cell, ses-setup): Use cursor-intangible instead of
`intangible'. Make sure cursor-intangible isn't sticky at BOB.
(ses-print-cell-new-width, ses-reprint-all, ses-recalculate-all):
Use ses--cell-at-pos.
(ses--mode-line-process, ses--cursor-sensor-highlight): New functions,
extracted from ses-command-hook. Make them work with multiple windows
displaying the same buffer.
(ses-mode): Use them via mode-line-process and pre-redisplay-functions.
Enable cursor-intangible-mode.
(ses-command-hook): Remove cell highlight and mode-line update code.
(ses-forward-or-insert, ses-copy-region-helper, ses-sort-column):
Update for new name of text-property holding the cell name.
(ses-rename-cell): Don't mess with mode-line-process.
* lisp/erc/erc-stamp.el (erc-add-timestamp): Use the new
cursor-sensor-functions property instead of point-entered.
(erc-insert-timestamp-right, erc-format-timestamp):
Use cursor-intangible rather than `intangible'.
(erc-munge-invisibility-spec): Use add-to-invisibility-spec and
remove-from-invisibility-spec. Enable cursor-intangible-mode and
cursor-sensor-mode if needed.
(erc-echo-timestamp): Adapt to calling convention of
cursor-sensor-functions.
(erc-insert-timestamp-right): Remove unused vars `current-window' and
`indent'.
* lisp/gnus/gnus-group.el (gnus-tmp-*): Declare.
(gnus-update-group-mark-positions): Remove unused `topic' var.
(gnus-group-insert-group-line): Remove unused var `header'.
(gnus-group--setup-tool-bar-update): New function.
(gnus-group-insert-group-line): Use it.
(gnus-group-update-eval-form): Declare local
dynamically-bound variables.
(gnus-group-unsubscribe-group): Use \` and \' to match string bounds.
* lisp/gnus/gnus-topic.el (gnus-topic-jump-to-topic)
(gnus-group-prepare-topics, gnus-topic-update-topic)
(gnus-topic-change-level, gnus-topic-catchup-articles)
(gnus-topic-remove-group, gnus-topic-delete, gnus-topic-indent):
Use inhibit-read-only.
(gnus-topic-prepare-topic): Use gnus-group--setup-tool-bar-update.
(gnus-topic-mode): Use define-minor-mode and derived-mode-p.
* lisp/textmodes/reftex-index.el (reftex-display-index):
Use cursor-intangible-mode if available.
(reftex-index-post-command-hook): Check cursor-intangible.
* lisp/textmodes/reftex-toc.el (reftex-toc):
Use cursor-intangible-mode if available.
(reftex-toc-recenter, reftex-toc-post-command-hook):
Check cursor-intangible.
* lisp/textmodes/sgml-mode.el: Use lexical-binding.
(sgml-tag): Use cursor-sensor-functions instead of point-entered.
(sgml-tags-invisible): Use with-silent-modifications and
inhibit-read-only. Enable cursor-sensor-mode.
(sgml-cursor-sensor): Rename from sgml-point-entered and adjust to
calling convention of cursor-sensor-functions.
* lisp/textmodes/table.el (table-cell-map-hook, table-load-hook)
(table-point-entered-cell-hook, table-point-left-cell-hook):
Don't autoload.
(table-cell-entered-state): Remove var.
(table--put-cell-point-entered/left-property)
(table--remove-cell-properties):
Use cursor-sensor-functions rather than point-entered/left.
(table--point-entered/left-cell-function): Merge
table--point-entered-cell-function and table--point-left-cell-function
and adjust to calling convention of cursor-sensor-functions.
2015-04-13 19:51:15 +00:00
|
|
|
|
(overlay-put ov 'invisible nil)))
|
1997-06-13 21:30:38 +00:00
|
|
|
|
|
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; This is called at the end of isearch. It will open the overlays
|
|
|
|
|
;; that contain the latest match. Obviously in case of a C-g the
|
|
|
|
|
;; point returns to the original location which surely is not contain
|
|
|
|
|
;; in any of these overlays, se we are safe in this case too.
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(defun isearch-open-necessary-overlays (ov)
|
2002-09-09 21:05:22 +00:00
|
|
|
|
(let ((inside-overlay (and (> (point) (overlay-start ov))
|
2014-12-13 15:54:14 +00:00
|
|
|
|
(<= (point) (overlay-end ov))))
|
1997-06-13 21:30:38 +00:00
|
|
|
|
;; 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))
|
Deprecate `intangible' and `point-entered' properties
* lisp/emacs-lisp/cursor-sensor.el: New file.
* lisp/simple.el (pre-redisplay-functions): New hook.
(redisplay--pre-redisplay-functions): New function.
(pre-redisplay-function): Use it.
(minibuffer-avoid-prompt): Mark obsolete.
(redisplay--update-region-highlight): Adapt it to work as a function on
pre-redisplay-functions.
* lisp/cus-start.el (minibuffer-prompt-properties--setter): New fun.
(minibuffer-prompt-properties): Use it. Use cursor-intangible rather
than point-entered to make the prompt intangible.
* lisp/forms.el: Move `provide' calls to the end.
(forms-mode): Don't use `run-hooks' on a local var.
(forms--make-format, forms--make-format-elt-using-text-properties):
Use cursor-intangible rather than `intangible'.
(forms-mode): Enable cursor-intangible-mode.
* lisp/isearch.el (isearch-mode): Use defvar-local.
(cursor-sensor-inhibit): Declare.
(isearch-mode): Set cursor-sensor-inhibit.
(isearch-done): Set it back.
(isearch-open-overlay-temporary, isearch-open-necessary-overlays)
(isearch-close-unnecessary-overlays): Don't bother with `intangible'
any more.
* lisp/ses.el (ses-localvars): Remove `mode-line-process'.
(ses-sym-rowcol, ses-cell-value, ses-col-width, ses-col-printer):
Add Edebug spec.
(ses-goto-print, ses-print-cell, ses-adjust-print-width)
(ses-goto-data, ses-setup, ses-copy-region): Don't let-bind
inhibit-point-motion-hooks any more.
(ses--cell-at-pos, ses--curcell): New functions, extracted from
ses-set-curcell.
(ses-set-curcell): Use them.
(ses-print-cell, ses-setup): Use cursor-intangible instead of
`intangible'. Make sure cursor-intangible isn't sticky at BOB.
(ses-print-cell-new-width, ses-reprint-all, ses-recalculate-all):
Use ses--cell-at-pos.
(ses--mode-line-process, ses--cursor-sensor-highlight): New functions,
extracted from ses-command-hook. Make them work with multiple windows
displaying the same buffer.
(ses-mode): Use them via mode-line-process and pre-redisplay-functions.
Enable cursor-intangible-mode.
(ses-command-hook): Remove cell highlight and mode-line update code.
(ses-forward-or-insert, ses-copy-region-helper, ses-sort-column):
Update for new name of text-property holding the cell name.
(ses-rename-cell): Don't mess with mode-line-process.
* lisp/erc/erc-stamp.el (erc-add-timestamp): Use the new
cursor-sensor-functions property instead of point-entered.
(erc-insert-timestamp-right, erc-format-timestamp):
Use cursor-intangible rather than `intangible'.
(erc-munge-invisibility-spec): Use add-to-invisibility-spec and
remove-from-invisibility-spec. Enable cursor-intangible-mode and
cursor-sensor-mode if needed.
(erc-echo-timestamp): Adapt to calling convention of
cursor-sensor-functions.
(erc-insert-timestamp-right): Remove unused vars `current-window' and
`indent'.
* lisp/gnus/gnus-group.el (gnus-tmp-*): Declare.
(gnus-update-group-mark-positions): Remove unused `topic' var.
(gnus-group-insert-group-line): Remove unused var `header'.
(gnus-group--setup-tool-bar-update): New function.
(gnus-group-insert-group-line): Use it.
(gnus-group-update-eval-form): Declare local
dynamically-bound variables.
(gnus-group-unsubscribe-group): Use \` and \' to match string bounds.
* lisp/gnus/gnus-topic.el (gnus-topic-jump-to-topic)
(gnus-group-prepare-topics, gnus-topic-update-topic)
(gnus-topic-change-level, gnus-topic-catchup-articles)
(gnus-topic-remove-group, gnus-topic-delete, gnus-topic-indent):
Use inhibit-read-only.
(gnus-topic-prepare-topic): Use gnus-group--setup-tool-bar-update.
(gnus-topic-mode): Use define-minor-mode and derived-mode-p.
* lisp/textmodes/reftex-index.el (reftex-display-index):
Use cursor-intangible-mode if available.
(reftex-index-post-command-hook): Check cursor-intangible.
* lisp/textmodes/reftex-toc.el (reftex-toc):
Use cursor-intangible-mode if available.
(reftex-toc-recenter, reftex-toc-post-command-hook):
Check cursor-intangible.
* lisp/textmodes/sgml-mode.el: Use lexical-binding.
(sgml-tag): Use cursor-sensor-functions instead of point-entered.
(sgml-tags-invisible): Use with-silent-modifications and
inhibit-read-only. Enable cursor-sensor-mode.
(sgml-cursor-sensor): Rename from sgml-point-entered and adjust to
calling convention of cursor-sensor-functions.
* lisp/textmodes/table.el (table-cell-map-hook, table-load-hook)
(table-point-entered-cell-hook, table-point-left-cell-hook):
Don't autoload.
(table-cell-entered-state): Remove var.
(table--put-cell-point-entered/left-property)
(table--remove-cell-properties):
Use cursor-sensor-functions rather than point-entered/left.
(table--point-entered/left-cell-function): Merge
table--point-entered-cell-function and table--point-left-cell-function
and adjust to calling convention of cursor-sensor-functions.
2015-04-13 19:51:15 +00:00
|
|
|
|
;; restore the values for the `invisible' properties.
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(overlay-put ov 'invisible (overlay-get ov 'isearch-invisible))
|
Deprecate `intangible' and `point-entered' properties
* lisp/emacs-lisp/cursor-sensor.el: New file.
* lisp/simple.el (pre-redisplay-functions): New hook.
(redisplay--pre-redisplay-functions): New function.
(pre-redisplay-function): Use it.
(minibuffer-avoid-prompt): Mark obsolete.
(redisplay--update-region-highlight): Adapt it to work as a function on
pre-redisplay-functions.
* lisp/cus-start.el (minibuffer-prompt-properties--setter): New fun.
(minibuffer-prompt-properties): Use it. Use cursor-intangible rather
than point-entered to make the prompt intangible.
* lisp/forms.el: Move `provide' calls to the end.
(forms-mode): Don't use `run-hooks' on a local var.
(forms--make-format, forms--make-format-elt-using-text-properties):
Use cursor-intangible rather than `intangible'.
(forms-mode): Enable cursor-intangible-mode.
* lisp/isearch.el (isearch-mode): Use defvar-local.
(cursor-sensor-inhibit): Declare.
(isearch-mode): Set cursor-sensor-inhibit.
(isearch-done): Set it back.
(isearch-open-overlay-temporary, isearch-open-necessary-overlays)
(isearch-close-unnecessary-overlays): Don't bother with `intangible'
any more.
* lisp/ses.el (ses-localvars): Remove `mode-line-process'.
(ses-sym-rowcol, ses-cell-value, ses-col-width, ses-col-printer):
Add Edebug spec.
(ses-goto-print, ses-print-cell, ses-adjust-print-width)
(ses-goto-data, ses-setup, ses-copy-region): Don't let-bind
inhibit-point-motion-hooks any more.
(ses--cell-at-pos, ses--curcell): New functions, extracted from
ses-set-curcell.
(ses-set-curcell): Use them.
(ses-print-cell, ses-setup): Use cursor-intangible instead of
`intangible'. Make sure cursor-intangible isn't sticky at BOB.
(ses-print-cell-new-width, ses-reprint-all, ses-recalculate-all):
Use ses--cell-at-pos.
(ses--mode-line-process, ses--cursor-sensor-highlight): New functions,
extracted from ses-command-hook. Make them work with multiple windows
displaying the same buffer.
(ses-mode): Use them via mode-line-process and pre-redisplay-functions.
Enable cursor-intangible-mode.
(ses-command-hook): Remove cell highlight and mode-line update code.
(ses-forward-or-insert, ses-copy-region-helper, ses-sort-column):
Update for new name of text-property holding the cell name.
(ses-rename-cell): Don't mess with mode-line-process.
* lisp/erc/erc-stamp.el (erc-add-timestamp): Use the new
cursor-sensor-functions property instead of point-entered.
(erc-insert-timestamp-right, erc-format-timestamp):
Use cursor-intangible rather than `intangible'.
(erc-munge-invisibility-spec): Use add-to-invisibility-spec and
remove-from-invisibility-spec. Enable cursor-intangible-mode and
cursor-sensor-mode if needed.
(erc-echo-timestamp): Adapt to calling convention of
cursor-sensor-functions.
(erc-insert-timestamp-right): Remove unused vars `current-window' and
`indent'.
* lisp/gnus/gnus-group.el (gnus-tmp-*): Declare.
(gnus-update-group-mark-positions): Remove unused `topic' var.
(gnus-group-insert-group-line): Remove unused var `header'.
(gnus-group--setup-tool-bar-update): New function.
(gnus-group-insert-group-line): Use it.
(gnus-group-update-eval-form): Declare local
dynamically-bound variables.
(gnus-group-unsubscribe-group): Use \` and \' to match string bounds.
* lisp/gnus/gnus-topic.el (gnus-topic-jump-to-topic)
(gnus-group-prepare-topics, gnus-topic-update-topic)
(gnus-topic-change-level, gnus-topic-catchup-articles)
(gnus-topic-remove-group, gnus-topic-delete, gnus-topic-indent):
Use inhibit-read-only.
(gnus-topic-prepare-topic): Use gnus-group--setup-tool-bar-update.
(gnus-topic-mode): Use define-minor-mode and derived-mode-p.
* lisp/textmodes/reftex-index.el (reftex-display-index):
Use cursor-intangible-mode if available.
(reftex-index-post-command-hook): Check cursor-intangible.
* lisp/textmodes/reftex-toc.el (reftex-toc):
Use cursor-intangible-mode if available.
(reftex-toc-recenter, reftex-toc-post-command-hook):
Check cursor-intangible.
* lisp/textmodes/sgml-mode.el: Use lexical-binding.
(sgml-tag): Use cursor-sensor-functions instead of point-entered.
(sgml-tags-invisible): Use with-silent-modifications and
inhibit-read-only. Enable cursor-sensor-mode.
(sgml-cursor-sensor): Rename from sgml-point-entered and adjust to
calling convention of cursor-sensor-functions.
* lisp/textmodes/table.el (table-cell-map-hook, table-load-hook)
(table-point-entered-cell-hook, table-point-left-cell-hook):
Don't autoload.
(table-cell-entered-state): Remove var.
(table--put-cell-point-entered/left-property)
(table--remove-cell-properties):
Use cursor-sensor-functions rather than point-entered/left.
(table--point-entered/left-cell-function): Merge
table--point-entered-cell-function and table--point-left-cell-function
and adjust to calling convention of cursor-sensor-functions.
2015-04-13 19:51:15 +00:00
|
|
|
|
(overlay-put ov 'isearch-invisible nil))
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(if inside-overlay
|
|
|
|
|
(funcall (overlay-get ov 'isearch-open-invisible) ov)
|
|
|
|
|
(if fct-temp
|
|
|
|
|
(funcall fct-temp ov t)))))
|
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; This is called when exiting isearch. It closes the temporary
|
|
|
|
|
;; opened overlays, except the ones that contain the latest match.
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(defun isearch-clean-overlays ()
|
|
|
|
|
(when isearch-opened-overlays
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(mapc 'isearch-open-necessary-overlays isearch-opened-overlays)
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(setq isearch-opened-overlays nil)))
|
|
|
|
|
|
2001-09-07 16:17:54 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-intersects-p (start0 end0 start1 end1)
|
|
|
|
|
"Return t if regions START0..END0 and START1..END1 intersect."
|
2001-09-12 13:10:08 +00:00
|
|
|
|
(or (and (>= start0 start1) (< start0 end1))
|
|
|
|
|
(and (> end0 start1) (<= end0 end1))
|
|
|
|
|
(and (>= start1 start0) (< start1 end0))
|
|
|
|
|
(and (> end1 start0) (<= end1 end0))))
|
2001-09-07 16:17:54 +00:00
|
|
|
|
|
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; Verify if the current match is outside of each element of
|
|
|
|
|
;; `isearch-opened-overlays', if so close that overlay.
|
2001-09-07 16:17:54 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-close-unnecessary-overlays (begin end)
|
|
|
|
|
(let ((overlays isearch-opened-overlays))
|
1997-06-13 21:30:38 +00:00
|
|
|
|
(setq isearch-opened-overlays nil)
|
2001-09-07 16:17:54 +00:00
|
|
|
|
(dolist (ov overlays)
|
|
|
|
|
(if (isearch-intersects-p begin end (overlay-start ov) (overlay-end ov))
|
|
|
|
|
(push ov isearch-opened-overlays)
|
|
|
|
|
(let ((fct-temp (overlay-get ov 'isearch-open-invisible-temporary)))
|
|
|
|
|
(if fct-temp
|
|
|
|
|
;; If this exists it means that the overlay was opened
|
|
|
|
|
;; using this function, not by us tweaking the overlay
|
|
|
|
|
;; properties.
|
|
|
|
|
(funcall fct-temp ov t)
|
|
|
|
|
(overlay-put ov 'invisible (overlay-get ov 'isearch-invisible))
|
Deprecate `intangible' and `point-entered' properties
* lisp/emacs-lisp/cursor-sensor.el: New file.
* lisp/simple.el (pre-redisplay-functions): New hook.
(redisplay--pre-redisplay-functions): New function.
(pre-redisplay-function): Use it.
(minibuffer-avoid-prompt): Mark obsolete.
(redisplay--update-region-highlight): Adapt it to work as a function on
pre-redisplay-functions.
* lisp/cus-start.el (minibuffer-prompt-properties--setter): New fun.
(minibuffer-prompt-properties): Use it. Use cursor-intangible rather
than point-entered to make the prompt intangible.
* lisp/forms.el: Move `provide' calls to the end.
(forms-mode): Don't use `run-hooks' on a local var.
(forms--make-format, forms--make-format-elt-using-text-properties):
Use cursor-intangible rather than `intangible'.
(forms-mode): Enable cursor-intangible-mode.
* lisp/isearch.el (isearch-mode): Use defvar-local.
(cursor-sensor-inhibit): Declare.
(isearch-mode): Set cursor-sensor-inhibit.
(isearch-done): Set it back.
(isearch-open-overlay-temporary, isearch-open-necessary-overlays)
(isearch-close-unnecessary-overlays): Don't bother with `intangible'
any more.
* lisp/ses.el (ses-localvars): Remove `mode-line-process'.
(ses-sym-rowcol, ses-cell-value, ses-col-width, ses-col-printer):
Add Edebug spec.
(ses-goto-print, ses-print-cell, ses-adjust-print-width)
(ses-goto-data, ses-setup, ses-copy-region): Don't let-bind
inhibit-point-motion-hooks any more.
(ses--cell-at-pos, ses--curcell): New functions, extracted from
ses-set-curcell.
(ses-set-curcell): Use them.
(ses-print-cell, ses-setup): Use cursor-intangible instead of
`intangible'. Make sure cursor-intangible isn't sticky at BOB.
(ses-print-cell-new-width, ses-reprint-all, ses-recalculate-all):
Use ses--cell-at-pos.
(ses--mode-line-process, ses--cursor-sensor-highlight): New functions,
extracted from ses-command-hook. Make them work with multiple windows
displaying the same buffer.
(ses-mode): Use them via mode-line-process and pre-redisplay-functions.
Enable cursor-intangible-mode.
(ses-command-hook): Remove cell highlight and mode-line update code.
(ses-forward-or-insert, ses-copy-region-helper, ses-sort-column):
Update for new name of text-property holding the cell name.
(ses-rename-cell): Don't mess with mode-line-process.
* lisp/erc/erc-stamp.el (erc-add-timestamp): Use the new
cursor-sensor-functions property instead of point-entered.
(erc-insert-timestamp-right, erc-format-timestamp):
Use cursor-intangible rather than `intangible'.
(erc-munge-invisibility-spec): Use add-to-invisibility-spec and
remove-from-invisibility-spec. Enable cursor-intangible-mode and
cursor-sensor-mode if needed.
(erc-echo-timestamp): Adapt to calling convention of
cursor-sensor-functions.
(erc-insert-timestamp-right): Remove unused vars `current-window' and
`indent'.
* lisp/gnus/gnus-group.el (gnus-tmp-*): Declare.
(gnus-update-group-mark-positions): Remove unused `topic' var.
(gnus-group-insert-group-line): Remove unused var `header'.
(gnus-group--setup-tool-bar-update): New function.
(gnus-group-insert-group-line): Use it.
(gnus-group-update-eval-form): Declare local
dynamically-bound variables.
(gnus-group-unsubscribe-group): Use \` and \' to match string bounds.
* lisp/gnus/gnus-topic.el (gnus-topic-jump-to-topic)
(gnus-group-prepare-topics, gnus-topic-update-topic)
(gnus-topic-change-level, gnus-topic-catchup-articles)
(gnus-topic-remove-group, gnus-topic-delete, gnus-topic-indent):
Use inhibit-read-only.
(gnus-topic-prepare-topic): Use gnus-group--setup-tool-bar-update.
(gnus-topic-mode): Use define-minor-mode and derived-mode-p.
* lisp/textmodes/reftex-index.el (reftex-display-index):
Use cursor-intangible-mode if available.
(reftex-index-post-command-hook): Check cursor-intangible.
* lisp/textmodes/reftex-toc.el (reftex-toc):
Use cursor-intangible-mode if available.
(reftex-toc-recenter, reftex-toc-post-command-hook):
Check cursor-intangible.
* lisp/textmodes/sgml-mode.el: Use lexical-binding.
(sgml-tag): Use cursor-sensor-functions instead of point-entered.
(sgml-tags-invisible): Use with-silent-modifications and
inhibit-read-only. Enable cursor-sensor-mode.
(sgml-cursor-sensor): Rename from sgml-point-entered and adjust to
calling convention of cursor-sensor-functions.
* lisp/textmodes/table.el (table-cell-map-hook, table-load-hook)
(table-point-entered-cell-hook, table-point-left-cell-hook):
Don't autoload.
(table-cell-entered-state): Remove var.
(table--put-cell-point-entered/left-property)
(table--remove-cell-properties):
Use cursor-sensor-functions rather than point-entered/left.
(table--point-entered/left-cell-function): Merge
table--point-entered-cell-function and table--point-left-cell-function
and adjust to calling convention of cursor-sensor-functions.
2015-04-13 19:51:15 +00:00
|
|
|
|
(overlay-put ov 'isearch-invisible nil)))))))
|
2001-09-07 16:17:54 +00:00
|
|
|
|
|
1997-06-13 21:30:38 +00:00
|
|
|
|
|
1997-02-10 09:41:31 +00:00
|
|
|
|
(defun isearch-range-invisible (beg end)
|
1997-07-19 05:34:23 +00:00
|
|
|
|
"Return t if all the text from BEG to END is invisible."
|
2002-11-07 17:46:04 +00:00
|
|
|
|
(when (/= 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-unnecessary-overlays beg end))
|
|
|
|
|
;; If the following character is currently invisible,
|
|
|
|
|
;; skip all characters with that same `invisible' property value.
|
|
|
|
|
;; Do that over and over.
|
2011-05-24 18:15:07 +00:00
|
|
|
|
(while (and (< (point) end) (invisible-p (point)))
|
2011-05-28 01:14:38 +00:00
|
|
|
|
(if (invisible-p (get-text-property (point) 'invisible))
|
2002-11-07 17:46:04 +00:00
|
|
|
|
(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))
|
|
|
|
|
(when 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))
|
2011-05-24 18:15:07 +00:00
|
|
|
|
(if (invisible-p invis-prop)
|
2002-11-07 17:46:04 +00:00
|
|
|
|
(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 can-be-opened (consp crt-overlays))
|
|
|
|
|
(progn
|
|
|
|
|
(setq isearch-opened-overlays
|
|
|
|
|
(append isearch-opened-overlays crt-overlays))
|
|
|
|
|
(mapc 'isearch-open-overlay-temporary crt-overlays)
|
|
|
|
|
nil)
|
|
|
|
|
(setq isearch-hidden t)))))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2008-12-23 21:01:41 +00:00
|
|
|
|
(defun isearch-filter-visible (beg end)
|
|
|
|
|
"Test whether the current search hit is visible at least partially.
|
|
|
|
|
Return non-nil if the text from BEG to END is visible to Isearch as
|
|
|
|
|
determined by `isearch-range-invisible' unless invisible text can be
|
|
|
|
|
searched too when `search-invisible' is t."
|
2008-04-22 19:56:17 +00:00
|
|
|
|
(or (eq search-invisible t)
|
|
|
|
|
(not (isearch-range-invisible beg end))))
|
|
|
|
|
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; General utilities
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
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.
|
1996-01-04 23:42:23 +00:00
|
|
|
|
If REGEXP-FLAG is non-nil, disregard letters preceded by `\\' (but not `\\\\')
|
1993-06-06 22:11:22 +00:00
|
|
|
|
since they have special meaning in a regexp."
|
2003-01-24 17:12:00 +00:00
|
|
|
|
(let (quote-flag (i 0) (len (length string)) found)
|
1996-12-07 22:17:50 +00:00
|
|
|
|
(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))))
|
2002-12-09 20:23:35 +00:00
|
|
|
|
(setq found t))
|
|
|
|
|
(setq quote-flag nil)))
|
1996-12-07 22:17:50 +00:00
|
|
|
|
(setq i (1+ i)))
|
2007-01-17 13:20:47 +00:00
|
|
|
|
(not (or found
|
|
|
|
|
;; Even if there's no uppercase char, we want to detect the use
|
|
|
|
|
;; of [:upper:] or [:lower:] char-class, which indicates
|
|
|
|
|
;; clearly that the user cares about case distinction.
|
|
|
|
|
(and regexp-flag (string-match "\\[:\\(upp\\|low\\)er:]" string)
|
|
|
|
|
(condition-case err
|
|
|
|
|
(progn
|
|
|
|
|
(string-match (substring string 0 (match-beginning 0))
|
|
|
|
|
"")
|
|
|
|
|
nil)
|
|
|
|
|
(invalid-regexp
|
|
|
|
|
(equal "Unmatched [ or [^" (cadr err)))))))))
|
1992-09-14 22:31:47 +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
|
|
|
|
(defun isearch-text-char-description (c)
|
2000-09-29 02:35:56 +00:00
|
|
|
|
(cond
|
2014-11-07 23:33:41 +00:00
|
|
|
|
((< c ?\s) (propertize
|
|
|
|
|
(char-to-string c)
|
|
|
|
|
'display (propertize (format "^%c" (+ c 64)) 'face 'escape-glyph)))
|
|
|
|
|
((= c ?\^?) (propertize
|
|
|
|
|
(char-to-string c)
|
|
|
|
|
'display (propertize "^?" 'face 'escape-glyph)))
|
2000-09-29 02:35:56 +00:00
|
|
|
|
(t (char-to-string c))))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1994-11-15 16:53:29 +00:00
|
|
|
|
;; General function to unread characters or events.
|
1995-12-21 17:49:54 +00:00
|
|
|
|
;; Also insert them in a keyboard macro being defined.
|
1993-03-06 06:15:05 +00:00
|
|
|
|
(defun isearch-unread (&rest char-or-events)
|
2000-11-21 21:28:05 +00:00
|
|
|
|
(mapc 'store-kbd-macro-event char-or-events)
|
1994-11-15 16:53:29 +00:00
|
|
|
|
(setq unread-command-events
|
|
|
|
|
(append char-or-events unread-command-events)))
|
1992-09-14 22:31:47 +00:00
|
|
|
|
|
1999-11-11 13:39:21 +00:00
|
|
|
|
|
2005-01-11 23:03:01 +00:00
|
|
|
|
;; Highlighting
|
|
|
|
|
|
|
|
|
|
(defvar isearch-overlay nil)
|
|
|
|
|
|
|
|
|
|
(defun isearch-highlight (beg end)
|
2005-12-09 09:45:06 +00:00
|
|
|
|
(if search-highlight
|
|
|
|
|
(if isearch-overlay
|
|
|
|
|
;; Overlay already exists, just move it.
|
|
|
|
|
(move-overlay isearch-overlay beg end (current-buffer))
|
|
|
|
|
;; Overlay doesn't exist, create it.
|
|
|
|
|
(setq isearch-overlay (make-overlay beg end))
|
|
|
|
|
;; 1001 is higher than lazy's 1000 and ediff's 100+
|
|
|
|
|
(overlay-put isearch-overlay 'priority 1001)
|
2010-09-17 22:09:58 +00:00
|
|
|
|
(overlay-put isearch-overlay 'face isearch-face))))
|
2005-01-11 23:03:01 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-dehighlight ()
|
|
|
|
|
(when isearch-overlay
|
|
|
|
|
(delete-overlay isearch-overlay)))
|
|
|
|
|
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; isearch-lazy-highlight feature
|
|
|
|
|
;; by Bob Glickstein <http://www.zanshin.com/~bobg/>
|
|
|
|
|
|
|
|
|
|
;; When active, *every* match for the current search string is
|
|
|
|
|
;; highlighted: the current one using the normal isearch match color
|
2005-01-06 04:44:57 +00:00
|
|
|
|
;; and all the others using `isearch-lazy-highlight'. The extra
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; highlighting makes it easier to anticipate where the cursor will
|
|
|
|
|
;; land each time you press C-s or C-r to repeat a pending search.
|
|
|
|
|
;; Highlighting of these additional matches happens in a deferred
|
|
|
|
|
;; fashion using "idle timers," so the cycles needed do not rob
|
|
|
|
|
;; isearch of its usual snappy response.
|
|
|
|
|
|
|
|
|
|
;; IMPLEMENTATION NOTE: This depends on some isearch internals.
|
|
|
|
|
;; Specifically:
|
|
|
|
|
;; - `isearch-update' is expected to be called (at least) every time
|
|
|
|
|
;; the search string or window-start changes;
|
|
|
|
|
;; - `isearch-string' is expected to contain the current search
|
|
|
|
|
;; string as entered by the user;
|
|
|
|
|
;; - the type of the current search is expected to be given by
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
;; `isearch-regexp-function' and `isearch-regexp';
|
2002-09-09 21:05:22 +00:00
|
|
|
|
;; - the direction of the current search is expected to be given by
|
|
|
|
|
;; `isearch-forward';
|
2005-03-15 10:45:25 +00:00
|
|
|
|
;; - the variable `isearch-error' is expected to be true
|
2007-08-08 07:40:09 +00:00
|
|
|
|
;; only if `isearch-string' is an invalid regexp.
|
1999-11-11 13:39:21 +00:00
|
|
|
|
|
|
|
|
|
(defvar isearch-lazy-highlight-overlays nil)
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-wrapped nil)
|
2005-02-16 09:41:02 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-start-limit nil)
|
|
|
|
|
(defvar isearch-lazy-highlight-end-limit nil)
|
1999-11-11 13:39:21 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-start nil)
|
|
|
|
|
(defvar isearch-lazy-highlight-end nil)
|
|
|
|
|
(defvar isearch-lazy-highlight-timer nil)
|
|
|
|
|
(defvar isearch-lazy-highlight-last-string nil)
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-window nil)
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-window-group nil)
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-window-start nil)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-window-end nil)
|
2001-01-22 11:23:38 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-case-fold-search nil)
|
|
|
|
|
(defvar isearch-lazy-highlight-regexp nil)
|
2012-09-02 09:31:45 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-lax-whitespace nil)
|
|
|
|
|
(defvar isearch-lazy-highlight-regexp-lax-whitespace nil)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-regexp-function nil)
|
|
|
|
|
(define-obsolete-variable-alias 'isearch-lazy-highlight-word
|
|
|
|
|
'isearch-lazy-highlight-regexp-function "25.1")
|
2010-08-08 20:55:52 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-forward nil)
|
2010-12-20 01:18:15 +00:00
|
|
|
|
(defvar isearch-lazy-highlight-error nil)
|
1999-11-11 13:39:21 +00:00
|
|
|
|
|
2017-02-21 23:22:18 +00:00
|
|
|
|
(defun lazy-highlight-cleanup (&optional force procrastinate)
|
2001-01-17 14:10:25 +00:00
|
|
|
|
"Stop lazy highlighting and remove extra highlighting from current buffer.
|
2017-02-21 23:22:18 +00:00
|
|
|
|
FORCE non-nil means do it whether or not `lazy-highlight-cleanup' is nil.
|
|
|
|
|
PROCRASTINATE non-nil means postpone cleanup to a later time.
|
|
|
|
|
This function is called when exiting an incremental search if
|
2005-01-04 02:21:55 +00:00
|
|
|
|
`lazy-highlight-cleanup' is non-nil."
|
1999-11-11 13:39:21 +00:00
|
|
|
|
(interactive '(t))
|
2017-02-21 23:22:18 +00:00
|
|
|
|
(when (and (or force lazy-highlight-cleanup) (not procrastinate))
|
|
|
|
|
(while isearch-lazy-highlight-overlays
|
|
|
|
|
(delete-overlay (car isearch-lazy-highlight-overlays))
|
|
|
|
|
(setq isearch-lazy-highlight-overlays
|
|
|
|
|
(cdr isearch-lazy-highlight-overlays))))
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(when isearch-lazy-highlight-timer
|
|
|
|
|
(cancel-timer isearch-lazy-highlight-timer)
|
|
|
|
|
(setq isearch-lazy-highlight-timer nil)))
|
1999-11-11 13:39:21 +00:00
|
|
|
|
|
(isearch-mode-map, isearch-other-meta-char, isearch-quote-char,
isearch-printing-char, isearch-text-char-description): "?\ " -> "?\s".
(isearch-lazy-highlight-cleanup, isearch-lazy-highlight-initial-delay,
isearch-lazy-highlight-interval, isearch-lazy-highlight-max-at-a-time,
isearch-lazy-highlight-face, isearch-lazy-highlight-cleanup): Declare with
define-obsolete-*-alias macros.
(isearch-forward): Fix typo in docstring.
(search-invisible, search-ring-yank-pointer, regexp-search-ring-yank-pointer):
Doc fixes.
2005-07-28 14:00:03 +00:00
|
|
|
|
(define-obsolete-function-alias 'isearch-lazy-highlight-cleanup
|
|
|
|
|
'lazy-highlight-cleanup
|
|
|
|
|
"22.1")
|
2005-03-18 07:06:45 +00:00
|
|
|
|
|
2005-03-18 09:59:31 +00:00
|
|
|
|
(defun isearch-lazy-highlight-new-loop (&optional beg end)
|
2015-12-07 15:12:15 +00:00
|
|
|
|
"Cleanup any previous `lazy-highlight' loop and begin a new one.
|
2005-02-16 09:41:02 +00:00
|
|
|
|
BEG and END specify the bounds within which highlighting should occur.
|
|
|
|
|
This is called when `isearch-update' is invoked (which can cause the
|
|
|
|
|
search string to change or the window to scroll). It is also used
|
|
|
|
|
by other Emacs features."
|
2004-12-15 10:08:51 +00:00
|
|
|
|
(when (and (null executing-kbd-macro)
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(sit-for 0) ;make sure (window-start) is credible
|
|
|
|
|
(or (not (equal isearch-string
|
|
|
|
|
isearch-lazy-highlight-last-string))
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
(not (memq (selected-window)
|
|
|
|
|
isearch-lazy-highlight-window-group))
|
2001-01-22 11:23:38 +00:00
|
|
|
|
(not (eq isearch-lazy-highlight-case-fold-search
|
|
|
|
|
isearch-case-fold-search))
|
|
|
|
|
(not (eq isearch-lazy-highlight-regexp
|
|
|
|
|
isearch-regexp))
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(not (eq isearch-lazy-highlight-regexp-function
|
|
|
|
|
isearch-regexp-function))
|
2012-09-02 09:31:45 +00:00
|
|
|
|
(not (eq isearch-lazy-highlight-lax-whitespace
|
|
|
|
|
isearch-lax-whitespace))
|
|
|
|
|
(not (eq isearch-lazy-highlight-regexp-lax-whitespace
|
|
|
|
|
isearch-regexp-lax-whitespace))
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(not (= (window-group-start)
|
2004-04-16 12:51:06 +00:00
|
|
|
|
isearch-lazy-highlight-window-start))
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(not (= (window-group-end) ; Window may have been split/joined.
|
2010-08-08 20:55:52 +00:00
|
|
|
|
isearch-lazy-highlight-window-end))
|
|
|
|
|
(not (eq isearch-forward
|
2010-12-20 01:18:15 +00:00
|
|
|
|
isearch-lazy-highlight-forward))
|
|
|
|
|
;; In case we are recovering from an error.
|
|
|
|
|
(not (equal isearch-error
|
|
|
|
|
isearch-lazy-highlight-error))))
|
2001-01-17 14:10:25 +00:00
|
|
|
|
;; something important did indeed change
|
2017-02-21 23:22:18 +00:00
|
|
|
|
(lazy-highlight-cleanup t (not (equal isearch-string ""))) ;stop old timer
|
2010-12-20 01:18:15 +00:00
|
|
|
|
(setq isearch-lazy-highlight-error isearch-error)
|
2011-11-19 21:03:12 +00:00
|
|
|
|
;; It used to check for `(not isearch-error)' here, but actually
|
|
|
|
|
;; lazy-highlighting might find matches to highlight even when
|
|
|
|
|
;; `isearch-error' is non-nil. (Bug#9918)
|
2015-12-07 15:12:15 +00:00
|
|
|
|
(setq isearch-lazy-highlight-start-limit beg
|
|
|
|
|
isearch-lazy-highlight-end-limit end)
|
2011-11-19 21:03:12 +00:00
|
|
|
|
(setq isearch-lazy-highlight-window (selected-window)
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
isearch-lazy-highlight-window-group (selected-window-group)
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
isearch-lazy-highlight-window-start (window-group-start)
|
|
|
|
|
isearch-lazy-highlight-window-end (window-group-end)
|
2013-02-21 17:45:12 +00:00
|
|
|
|
;; Start lazy-highlighting at the beginning of the found
|
|
|
|
|
;; match (`isearch-other-end'). If no match, use point.
|
|
|
|
|
;; One of the next two variables (depending on search direction)
|
|
|
|
|
;; is used to define the starting position of lazy-highlighting
|
|
|
|
|
;; and also to remember the current position of point between
|
|
|
|
|
;; calls of `isearch-lazy-highlight-update', and another variable
|
|
|
|
|
;; is used to define where the wrapped search must stop.
|
|
|
|
|
isearch-lazy-highlight-start (or isearch-other-end (point))
|
|
|
|
|
isearch-lazy-highlight-end (or isearch-other-end (point))
|
2011-11-19 21:03:12 +00:00
|
|
|
|
isearch-lazy-highlight-wrapped nil
|
|
|
|
|
isearch-lazy-highlight-last-string isearch-string
|
|
|
|
|
isearch-lazy-highlight-case-fold-search isearch-case-fold-search
|
|
|
|
|
isearch-lazy-highlight-regexp isearch-regexp
|
2012-09-02 09:31:45 +00:00
|
|
|
|
isearch-lazy-highlight-lax-whitespace isearch-lax-whitespace
|
|
|
|
|
isearch-lazy-highlight-regexp-lax-whitespace isearch-regexp-lax-whitespace
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
isearch-lazy-highlight-regexp-function isearch-regexp-function
|
2011-11-19 21:03:12 +00:00
|
|
|
|
isearch-lazy-highlight-forward isearch-forward)
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
(unless (equal isearch-string "")
|
2015-12-07 15:12:15 +00:00
|
|
|
|
(setq isearch-lazy-highlight-timer
|
|
|
|
|
(run-with-idle-timer lazy-highlight-initial-delay nil
|
2017-02-21 23:22:18 +00:00
|
|
|
|
'isearch-lazy-highlight-start)))))
|
2001-01-17 14:10:25 +00:00
|
|
|
|
|
|
|
|
|
(defun isearch-lazy-highlight-search ()
|
|
|
|
|
"Search ahead for the next or previous match, for lazy highlighting.
|
* isearch.el (isearch-search-string): Doc fix.
(search-exit-option, search-slow-window-lines, search-slow-speed)
(search-upper-case, search-nonincremental-instead)
(search-whitespace-regexp, search-ring-max, regexp-search-ring-max)
(search-ring-update, search-highlight, isearch-lazy-highlight)
(lazy-highlight-cleanup, lazy-highlight-initial-delay)
(lazy-highlight-interval): Remove * from defcustom docstrings.
(isearch-resume-in-command-history, lazy-highlight-max-at-a-time):
Remove * from defcustom docstrings; fix typos.
(isearch-push-state-function, isearch-help-for-help-internal)
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-mode, minibuffer-local-isearch-map, isearch-mode)
(isearch-pop-fun-state, isearch-search-fun-function)
(isearch-lazy-highlight-search): Fix typos in docstrings.
(isearch-yank-internal, isearch-fallback): Reflow docstrings.
(isearch-forward): Fix typo and reflow docstring.
(isearch-help-map): Remove unused `i' binding. Fix typos in docstring.
(isearch-mode-map): Don't use `let*'.
2008-11-21 10:12:57 +00:00
|
|
|
|
Attempt to do the search exactly the way the pending Isearch would."
|
2008-11-11 19:57:04 +00:00
|
|
|
|
(condition-case nil
|
|
|
|
|
(let ((case-fold-search isearch-lazy-highlight-case-fold-search)
|
|
|
|
|
(isearch-regexp isearch-lazy-highlight-regexp)
|
* lisp/isearch.el: Rename word search to regexp-function search
`isearch-word' went well beyond its original purpose, and the name
no longer makes sense. It is now called
`isearch-regexp-function', and it's value should always be a
function that converts a string to a regexp (though setting it to
t is still supported for now).
(isearch-word): Make obsolete.
(isearch-regexp-function): New variable.
(isearch-mode, isearch-done, isearch--state, isearch--set-state)
(with-isearch-suspended, isearch-toggle-regexp)
(isearch-toggle-word, isearch-toggle-symbol)
(isearch-toggle-character-fold, isearch-query-replace)
(isearch-occur, isearch-highlight-regexp)
(isearch-search-and-update, isearch-message-prefix)
(isearch-search-fun-default, isearch-search)
(isearch-lazy-highlight-new-loop, isearch-lazy-highlight-search):
Use it.
(isearch-lazy-highlight-regexp-function): New var.
(isearch-lazy-highlight-word): Make obsolete.
(isearch--describe-regexp-mode): New function.
(isearch--describe-word-mode): Make obsolete.
* lisp/info.el (Info-isearch-search): Use the new var.
* lisp/replace.el (replace-search, replace-highlight): Use the new
var.
* lisp/obsolete/longlines.el (longlines-search-function): Use the
new var.
* lisp/hexl.el (hexl-isearch-search-function): Use the new var.
* lisp/cedet/semantic/senator.el (senator-isearch-search-fun): Use
the new var.
2015-10-21 16:07:08 +00:00
|
|
|
|
(isearch-regexp-function isearch-lazy-highlight-regexp-function)
|
2012-09-06 08:49:40 +00:00
|
|
|
|
(isearch-lax-whitespace
|
|
|
|
|
isearch-lazy-highlight-lax-whitespace)
|
|
|
|
|
(isearch-regexp-lax-whitespace
|
|
|
|
|
isearch-lazy-highlight-regexp-lax-whitespace)
|
|
|
|
|
(isearch-forward isearch-lazy-highlight-forward)
|
2008-11-11 19:57:04 +00:00
|
|
|
|
(search-invisible nil) ; don't match invisible text
|
|
|
|
|
(retry t)
|
|
|
|
|
(success nil)
|
2010-08-08 20:55:52 +00:00
|
|
|
|
(bound (if isearch-lazy-highlight-forward
|
2008-11-11 19:57:04 +00:00
|
|
|
|
(min (or isearch-lazy-highlight-end-limit (point-max))
|
|
|
|
|
(if isearch-lazy-highlight-wrapped
|
2014-12-15 23:45:12 +00:00
|
|
|
|
(+ isearch-lazy-highlight-start
|
|
|
|
|
;; Extend bound to match whole string at point
|
|
|
|
|
(1- (length isearch-lazy-highlight-last-string)))
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(window-group-end)))
|
2008-11-11 19:57:04 +00:00
|
|
|
|
(max (or isearch-lazy-highlight-start-limit (point-min))
|
2005-03-15 10:45:25 +00:00
|
|
|
|
(if isearch-lazy-highlight-wrapped
|
2014-12-15 23:45:12 +00:00
|
|
|
|
(- isearch-lazy-highlight-end
|
|
|
|
|
;; Extend bound to match whole string at point
|
|
|
|
|
(1- (length isearch-lazy-highlight-last-string)))
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(window-group-start))))))
|
2008-11-17 00:42:46 +00:00
|
|
|
|
;; Use a loop like in `isearch-search'.
|
2008-11-11 19:57:04 +00:00
|
|
|
|
(while retry
|
|
|
|
|
(setq success (isearch-search-string
|
|
|
|
|
isearch-lazy-highlight-last-string bound t))
|
2008-11-17 00:42:46 +00:00
|
|
|
|
;; Clear RETRY unless the search predicate says
|
|
|
|
|
;; to skip this search hit.
|
2008-11-11 19:57:04 +00:00
|
|
|
|
(if (or (not success)
|
2010-06-06 09:52:13 +00:00
|
|
|
|
(= (point) bound) ; like (bobp) (eobp) in `isearch-search'.
|
|
|
|
|
(= (match-beginning 0) (match-end 0))
|
2013-08-05 18:05:46 +00:00
|
|
|
|
(funcall isearch-filter-predicate
|
|
|
|
|
(match-beginning 0) (match-end 0)))
|
2008-11-11 19:57:04 +00:00
|
|
|
|
(setq retry nil)))
|
|
|
|
|
success)
|
|
|
|
|
(error nil)))
|
1999-11-11 13:39:21 +00:00
|
|
|
|
|
2017-02-21 23:22:18 +00:00
|
|
|
|
(defun isearch-lazy-highlight-start ()
|
|
|
|
|
"Start a new lazy-highlight updating loop."
|
|
|
|
|
(lazy-highlight-cleanup t) ;remove old overlays
|
|
|
|
|
(isearch-lazy-highlight-update))
|
|
|
|
|
|
1999-11-11 13:39:21 +00:00
|
|
|
|
(defun isearch-lazy-highlight-update ()
|
2001-01-17 14:10:25 +00:00
|
|
|
|
"Update highlighting of other matches for current search."
|
2005-01-04 02:21:55 +00:00
|
|
|
|
(let ((max lazy-highlight-max-at-a-time)
|
2001-01-17 14:10:25 +00:00
|
|
|
|
(looping t)
|
|
|
|
|
nomore)
|
2004-12-12 21:53:14 +00:00
|
|
|
|
(with-local-quit
|
|
|
|
|
(save-selected-window
|
|
|
|
|
(if (and (window-live-p isearch-lazy-highlight-window)
|
First commit to scratch/follow. Make Isearch work with Follow Mode, etc.
doc/lispref/window.texi (Basic Windows): Add paragraph defining "Group of
Windows" and new @defun selected-window-group.
(Window Start and End): Describe new &optional parameter GROUP and
...-group-function for window-start, window-end, set-window-start, and
pos-visible-in-window-p.
(Textual Scrolling) Describe the same for recenter.
doc/lispref/positions.texi (Screen Lines): Describe the same for
move-to-window-line.
src/window.c (Fwindow_start, Fwindow_end, Fset_window_start)
(Fpos_visible_in_window_p, Frecenter, Fmove_to_window_line): To each, add ar
new optional parameter "group". At the beginning of each, check whether the
corresponding ...-group-function is set to a function, and if so execute this
function in place of the normal processing.
(syms_of_window): Define symbols for the six new variables below.
(window-start-group-function, window-end-group-function)
(set-window-start-group-function, recenter-group-function)
(pos-visible-in-window-p-group-function, move-to-window-line-group-function):
New permanent local buffer local variables.
src/keyboard.c (Fposn_at_point): Add extra parameter in call to
Fpos_visible_in_window_p.
lisp/window.el (selected-window-group-function): New permanent local buffer
local variable.
(selected-window-group): New function.
lisp/follow.el (follow-mode): Set the ...-group-function variables at mode
enable, kill them at mode disable. Add/remove follow-after-change to/from
after-change-functions.
(follow-start-end-invalid): New variable.
(follow-redisplay): Manipulate follow-start-end-invalid.
(follow-after-change, follow-window-start, follow-window-end)
(follow-set-window-start, follow-pos-visible-in-window-p)
(follow-move-to-window-line, follow-sit-for): New functions.
lisp/isearch.el (isearch-call-message): New macro.
(isearch-update, with-isearch-suspended, isearch-del-char)
(isearch-search-and-update, isearch-ring-adjust): Invoke above new macro.
(with-isearch-suspended): Rearrange code such that isearch-call-message is
invoked before point is moved.
(isearch-message): Add comment about where point must be at function call.
(isearch-search): Remove call to isearch-message.
(isearch-lazy-highlight-window-group): New variable.
(isearch-lazy-highlight-new-loop): Unconditionally start idle timer. Move
the battery of tests to ...
(isearch-lazy-highlight-maybe-new-loop): New function, started by idle timer.
Note: (sit-for 0) is still called.
(isearch-lazy-highlight-update): Check membership of
isearch-lazy-highlight-window-group. Don't set the `window' overlay
property.
(isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-maybe-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update)
(isearch-lazy-highlight-update): Call the six amended primitives (see
src/window.c above) with the new `group' argument set to t, to cooperate
with Follow Mode.
2015-11-11 12:02:48 +00:00
|
|
|
|
(not (memq (selected-window) isearch-lazy-highlight-window-group)))
|
2004-12-12 21:53:14 +00:00
|
|
|
|
(select-window isearch-lazy-highlight-window))
|
|
|
|
|
(save-excursion
|
|
|
|
|
(save-match-data
|
2010-08-08 20:55:52 +00:00
|
|
|
|
(goto-char (if isearch-lazy-highlight-forward
|
2004-12-12 21:53:14 +00:00
|
|
|
|
isearch-lazy-highlight-end
|
|
|
|
|
isearch-lazy-highlight-start))
|
|
|
|
|
(while looping
|
|
|
|
|
(let ((found (isearch-lazy-highlight-search)))
|
|
|
|
|
(when max
|
|
|
|
|
(setq max (1- max))
|
|
|
|
|
(if (<= max 0)
|
|
|
|
|
(setq looping nil)))
|
|
|
|
|
(if found
|
|
|
|
|
(let ((mb (match-beginning 0))
|
|
|
|
|
(me (match-end 0)))
|
|
|
|
|
(if (= mb me) ;zero-length match
|
2010-08-08 20:55:52 +00:00
|
|
|
|
(if isearch-lazy-highlight-forward
|
2004-12-12 21:53:14 +00:00
|
|
|
|
(if (= mb (if isearch-lazy-highlight-wrapped
|
|
|
|
|
isearch-lazy-highlight-start
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(window-group-end)))
|
2004-12-12 21:53:14 +00:00
|
|
|
|
(setq found nil)
|
|
|
|
|
(forward-char 1))
|
|
|
|
|
(if (= mb (if isearch-lazy-highlight-wrapped
|
|
|
|
|
isearch-lazy-highlight-end
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(window-group-start)))
|
2004-12-12 21:53:14 +00:00
|
|
|
|
(setq found nil)
|
|
|
|
|
(forward-char -1)))
|
|
|
|
|
|
|
|
|
|
;; non-zero-length match
|
|
|
|
|
(let ((ov (make-overlay mb me)))
|
|
|
|
|
(push ov isearch-lazy-highlight-overlays)
|
2005-12-09 09:45:06 +00:00
|
|
|
|
;; 1000 is higher than ediff's 100+,
|
|
|
|
|
;; but lower than isearch main overlay's 1001
|
|
|
|
|
(overlay-put ov 'priority 1000)
|
2017-02-22 00:10:36 +00:00
|
|
|
|
(overlay-put ov 'face 'lazy-highlight)
|
|
|
|
|
(unless (eq isearch-lazy-highlight 'all-windows)
|
|
|
|
|
(overlay-put ov 'window (selected-window)))))
|
2013-02-21 17:45:12 +00:00
|
|
|
|
;; Remember the current position of point for
|
|
|
|
|
;; the next call of `isearch-lazy-highlight-update'
|
|
|
|
|
;; when `lazy-highlight-max-at-a-time' is too small.
|
2010-08-08 20:55:52 +00:00
|
|
|
|
(if isearch-lazy-highlight-forward
|
2004-12-12 21:53:14 +00:00
|
|
|
|
(setq isearch-lazy-highlight-end (point))
|
|
|
|
|
(setq isearch-lazy-highlight-start (point)))))
|
|
|
|
|
|
|
|
|
|
;; not found or zero-length match at the search bound
|
|
|
|
|
(if (not found)
|
|
|
|
|
(if isearch-lazy-highlight-wrapped
|
|
|
|
|
(setq looping nil
|
|
|
|
|
nomore t)
|
|
|
|
|
(setq isearch-lazy-highlight-wrapped t)
|
2010-08-08 20:55:52 +00:00
|
|
|
|
(if isearch-lazy-highlight-forward
|
2004-12-12 21:53:14 +00:00
|
|
|
|
(progn
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(setq isearch-lazy-highlight-end (window-group-start))
|
2005-02-16 09:41:02 +00:00
|
|
|
|
(goto-char (max (or isearch-lazy-highlight-start-limit (point-min))
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(window-group-start))))
|
|
|
|
|
(setq isearch-lazy-highlight-start (window-group-end))
|
2005-02-16 09:41:02 +00:00
|
|
|
|
(goto-char (min (or isearch-lazy-highlight-end-limit (point-max))
|
Replace GROUP argument in six window primitives by new functions.
* doc/lispref/windows.texi (Window Start and End, Textual Scrolling)
* doc/lispref/positions.texi (Screen Lines): Remove optional GROUP argument
from description of six window functions. Add in description of new functions
window-group-start, window-group-end, set-window-group-start,
pos-visible-in-window-group-p, recenter-group and move-to-window-group-line,
together with the six variables indirecting to the pertinent group
functions.
* src/window.c
* src/keyboard.c: Revert the commit from 2015-11-11 12:02:48, in so far as it
applies to these two files, which added the GROUP argument to six window
primitives.
* lisp/follow.el (follow-mode): Use updated variable names for the indirected
functions.
* lisp/isearch.el (isearch-update, isearch-done, isearch-string-out-of-window)
(isearch-back-into-window, isearch-lazy-highlight-new-loop)
(isearch-lazy-highlight-search, isearch-lazy-highlight-update): Replace calls
to window primitives (e.g. window-start) with a GROUP argument by calls to
new functions (e.g. window-group-start).
* lisp/ispell.el (ispell-command-loop): Replace call to
pos-visible-in-window-p with pos-visible-in-window-group-p.
* lisp/window.el (window-group-start, window-group-end)
(set-window-group-start, recenter-group, pos-visible-in-window-group-p)
(selected-window-group, move-to-window-group-line): New functions.
(window-group-start-function, window-group-end-function)
(set-window-group-start-function, recenter-group-function)
(pos-visible-in-window-group-p-function, selected-window-group-function)
(move-to-window-group-line-function): New variables.
2015-12-14 16:38:07 +00:00
|
|
|
|
(window-group-end))))))))
|
2004-12-12 21:53:14 +00:00
|
|
|
|
(unless nomore
|
|
|
|
|
(setq isearch-lazy-highlight-timer
|
2005-01-06 06:54:28 +00:00
|
|
|
|
(run-at-time lazy-highlight-interval nil
|
2004-12-12 21:53:14 +00:00
|
|
|
|
'isearch-lazy-highlight-update)))))))))
|
1999-11-11 13:39:21 +00:00
|
|
|
|
|
2007-10-28 14:49:41 +00:00
|
|
|
|
(defun isearch-resume (string regexp word forward message case-fold)
|
2000-07-26 14:48:00 +00:00
|
|
|
|
"Resume an incremental search.
|
2007-10-28 14:49:41 +00:00
|
|
|
|
STRING is the string or regexp searched for.
|
2000-07-26 14:48:00 +00:00
|
|
|
|
REGEXP non-nil means the resumed search was a regexp search.
|
|
|
|
|
WORD non-nil means resume a word search.
|
|
|
|
|
FORWARD non-nil means resume a forward search.
|
|
|
|
|
MESSAGE is the echo-area message recorded for the search resumed.
|
|
|
|
|
CASE-FOLD non-nil means the search was case-insensitive."
|
|
|
|
|
(isearch-mode forward regexp nil nil word)
|
2007-10-28 14:49:41 +00:00
|
|
|
|
(setq isearch-string string
|
2000-07-26 14:48:00 +00:00
|
|
|
|
isearch-message message
|
|
|
|
|
isearch-case-fold-search case-fold)
|
2007-10-28 14:49:41 +00:00
|
|
|
|
(isearch-search)
|
|
|
|
|
(isearch-update))
|
2002-09-09 21:05:22 +00:00
|
|
|
|
|
2016-11-25 10:29:44 +00:00
|
|
|
|
(provide 'isearch)
|
|
|
|
|
|
1993-03-17 15:58:09 +00:00
|
|
|
|
;;; isearch.el ends here
|