diff options
| author | Juri Linkov | 2022-12-28 20:27:07 +0200 |
|---|---|---|
| committer | Juri Linkov | 2022-12-28 20:27:07 +0200 |
| commit | 7a0eaee198003aa6c1410107f051b45e0b786ce9 (patch) | |
| tree | 0231d166359fc7d9b7951c246563f64c3c6536f8 /lisp | |
| parent | b69bffeec05302529209559dfb2ab24d9e711192 (diff) | |
| download | emacs-7a0eaee198003aa6c1410107f051b45e0b786ce9.tar.gz emacs-7a0eaee198003aa6c1410107f051b45e0b786ce9.zip | |
* lisp/isearch.el: Small fixes.
(isearch-wrap-pause): Mention the new feature of `no' and `no-ding'
in the docstring.
(isearch-lax-whitespace, isearch-forward-thing-at-point): Add the
group 'isearch' since another defgroup changed the default group.
(isearch-delete-char): Use 'isearch-invisible' instead of 'search-invisible'
since the users might change the current value with 'M-s i'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/isearch.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 6a17d18c45e..ba67cce841a 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -181,7 +181,9 @@ When t (by default), signal an error when no more matches are found. | |||
| 181 | Then after repeating the search, wrap with `isearch-wrap-function'. | 181 | Then after repeating the search, wrap with `isearch-wrap-function'. |
| 182 | When `no', wrap immediately after reaching the last match. | 182 | When `no', wrap immediately after reaching the last match. |
| 183 | When `no-ding', wrap immediately without flashing the screen. | 183 | When `no-ding', wrap immediately without flashing the screen. |
| 184 | When nil, never wrap, just stop at the last match." | 184 | When nil, never wrap, just stop at the last match. |
| 185 | With the values `no' and `no-ding' the search will try | ||
| 186 | to wrap around also on typing a character." | ||
| 185 | :type '(choice (const :tag "Pause before wrapping" t) | 187 | :type '(choice (const :tag "Pause before wrapping" t) |
| 186 | (const :tag "No pause before wrapping" no) | 188 | (const :tag "No pause before wrapping" no) |
| 187 | (const :tag "No pause and no flashing" no-ding) | 189 | (const :tag "No pause and no flashing" no-ding) |
| @@ -880,6 +882,7 @@ matches literally, against one space. You can toggle the value of this | |||
| 880 | variable by the command `isearch-toggle-lax-whitespace', usually bound to | 882 | variable by the command `isearch-toggle-lax-whitespace', usually bound to |
| 881 | `M-s SPC' during isearch." | 883 | `M-s SPC' during isearch." |
| 882 | :type 'boolean | 884 | :type 'boolean |
| 885 | :group 'isearch | ||
| 883 | :version "25.1") | 886 | :version "25.1") |
| 884 | 887 | ||
| 885 | (defvar isearch-regexp-lax-whitespace nil | 888 | (defvar isearch-regexp-lax-whitespace nil |
| @@ -1179,6 +1182,7 @@ Each element of the list should be one of the symbols supported by | |||
| 1179 | `isearch-forward-thing-at-point' to yank the initial \"thing\" | 1182 | `isearch-forward-thing-at-point' to yank the initial \"thing\" |
| 1180 | as text to the search string." | 1183 | as text to the search string." |
| 1181 | :type '(repeat (symbol :tag "Thing symbol")) | 1184 | :type '(repeat (symbol :tag "Thing symbol")) |
| 1185 | :group 'isearch | ||
| 1182 | :version "28.1") | 1186 | :version "28.1") |
| 1183 | 1187 | ||
| 1184 | (defun isearch-forward-thing-at-point () | 1188 | (defun isearch-forward-thing-at-point () |
| @@ -2525,10 +2529,11 @@ If no input items have been entered yet, just beep." | |||
| 2525 | (ding) | 2529 | (ding) |
| 2526 | (isearch-pop-state)) | 2530 | (isearch-pop-state)) |
| 2527 | ;; When going back to the hidden match, reopen it and close other overlays. | 2531 | ;; When going back to the hidden match, reopen it and close other overlays. |
| 2528 | (when (and (eq search-invisible 'open) isearch-hide-immediately) | 2532 | (when (and (eq isearch-invisible 'open) isearch-hide-immediately) |
| 2529 | (if isearch-other-end | 2533 | (if isearch-other-end |
| 2530 | (isearch-range-invisible (min (point) isearch-other-end) | 2534 | (let ((search-invisible isearch-invisible)) |
| 2531 | (max (point) isearch-other-end)) | 2535 | (isearch-range-invisible (min (point) isearch-other-end) |
| 2536 | (max (point) isearch-other-end))) | ||
| 2532 | (isearch-close-unnecessary-overlays (point) (point)))) | 2537 | (isearch-close-unnecessary-overlays (point) (point)))) |
| 2533 | (isearch-update)) | 2538 | (isearch-update)) |
| 2534 | 2539 | ||