1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-19 10:22:27 +00:00
Commit Graph

263 Commits

Author SHA1 Message Date
Stefan Monnier
191f025abf (isearch-cmds): Add docstring.
(isearch-mouse-2): Lookup binding in the proper buffer.
Use call-interactively and remove the now useless `arg'.
(isearch-search-fun-function): New var.
(isearch-search-fun): New fun.
(isearch-search, isearch-lazy-highlight-search): Use it.
2002-09-09 21:05:22 +00:00
Richard M. Stallman
ad871438dd Don't require timer. 2002-04-27 03:46:26 +00:00
Richard M. Stallman
360e0dd587 (isearch-mode): Don't call make-frame-visible
if frame is already visible.
2002-04-10 14:47:27 +00:00
Pavel Janík
153a9b8cc0 (isearch-message-prefix): Use minibuffer-prompt face for prompt. 2002-04-09 09:25:44 +00:00
Richard M. Stallman
4c01d4bda7 (isearch-update): Don't update display in kbd macro.
(isearch-lazy-highlight-new-loop): Do nothing in kbd macro.
2002-02-06 15:25:15 +00:00
Karl Fogel
21d908055d (isearch-forward, isearch-edit-string): Make doc
strings mention keybinding for `isearch-yank-word-or-char',
rather than `isearch-yank-word', since the former is bound now
and the latter is not.
(isearch-yank-word-or-char): Fix formatting.
2001-12-19 22:48:02 +00:00
Richard M. Stallman
8cc3c8215c (isearch-edit-string): When we set isearch-string
to the default, also set isearch-message.
2001-12-16 20:19:13 +00:00
Richard M. Stallman
ddbe3d5ff3 (isearch-start-hscroll): New variable.
(isearch-mode): Set isearch-start-hscroll.
(isearch-update): Restore original hscrolling if possible.
2001-12-16 03:56:40 +00:00
Richard M. Stallman
88715f05a1 (isearch-edit-string):
Treat isearch-yank-word-or-char specially, like isearch-yank-word.
2001-12-16 03:53:15 +00:00
Richard M. Stallman
868bf43ad4 (isearch-yank-word-or-char): New function.
(isearch-mode-map): Bind C-w to that.
2001-12-10 20:45:27 +00:00
Pavel Janík
d6b8a1c059 Remove unnecessary spaces in doc-string. 2001-12-03 06:13:55 +00:00
Kim F. Storm
6848c9f166 (isearch-resume-enabled): New variable.
(isearch-done): Use that variable.
2001-12-02 01:13:55 +00:00
Karl Fogel
29e53a0ae9 (isearch-yank-internal): New helper function.
(isearch-yank-char): New function.
(isearch-yank-word, isearch-yank-line): Rewrite to use
isearch-yank-internal.
2001-11-28 22:34:20 +00:00
Richard M. Stallman
b4d7a2ece9 Comment change. 2001-11-19 06:21:29 +00:00
Richard M. Stallman
5bcf005469 (isearch): Use magenta2 as bg for (background light) 2001-11-18 06:47:21 +00:00
Richard M. Stallman
fad241d332 (isearch-mode): Handle negative search-slow-window-lines correctly.
(isearch-whitespace-chars): Doc fix.
2001-11-13 16:39:40 +00:00
Gerd Moellmann
3f482bc0e5 (isearch-mode-map): Bind `mouse-movement' to nil. 2001-10-18 10:06:01 +00:00
Gerd Moellmann
67085aba97 (isearch-last-case-fold-search): New variable.
(isearch-mode): Remember value of isearch-case-fold-search
in isearch-last-case-fold-search.
(isearch-done): Quote value of isearch-case-fold-search.
(isearch-repeat): When resuming a search, restore
isearch-case-fold-search from isearch-last-case-fold-search.
2001-10-05 09:24:20 +00:00
Gerd Moellmann
eaa493dfe6 (isearch-intersects-p): Fix end checks. 2001-09-12 13:10:08 +00:00
Gerd Moellmann
fc0eccfcce (isearch-intersects-p): New function.
(isearch-close-unnecessary-overlays): Renamed from *unecessary*,
use isearch-intersects-p, and clean up.
2001-09-07 16:17:54 +00:00
Gerd Moellmann
e4af142698 (isearch-mouse-2): Renamed from isearch-mouse-yank.
Instead of running mouse-yank-at-click, see what the event is
bound to outside Isearch and run that.
2001-08-31 08:51:39 +00:00
Gerd Moellmann
346f18dcd4 (isearch-other-meta-char): Don't switch to the
buffer of a window clicked on, when the current buffer is
in Isearch mode.
2001-08-10 12:48:02 +00:00
Gerd Moellmann
17635d50f6 (isearch-other-meta-char): Fix last change. 2001-07-25 14:51:10 +00:00
Gerd Moellmann
3fb01f36c5 (isearch-other-meta-char): Don't modify mode-line and
similar events for which fake prefix keys are generated.  It's no
longer necessary since read_key_sequence doesn't modify these
events for internal purposes anymore.
2001-07-25 14:02:28 +00:00
Pavel Janík
5553563924 Some fixes to follow coding conventions in files maintained by FSF. 2001-07-15 16:15:35 +00:00
Eli Zaretskii
1e14b09539 (isearch-forward): Doc fix. 2001-02-05 17:15:07 +00:00
Kenichi Handa
37b20c9be5 (isearch-forward): Add description about input method in the docsting. 2001-02-05 00:39:48 +00:00
Eli Zaretskii
8005142f86 (isearch-highlight): Don't punt if the display
doesn't support colors, since isearch faces are defined for
monochrome displays as well.
2001-01-28 13:13:00 +00:00
Gerd Moellmann
46daf6c747 (isearch-lazy-highlight-case-fold-search)
(isearch-lazy-highlight-regexp): New variables.
(isearch-lazy-highlight-cleanup): Update lazy highlight if
case-fold search or regexp search has been toggled.
2001-01-22 11:23:38 +00:00
Gerd Moellmann
871e0439db (isearch-lazy-highlight-initial-delay): Set default
to 0.25.
2001-01-22 10:20:06 +00:00
Eli Zaretskii
6c551d4e1f (isearch-forward): Add isearch-toggle-case-fold,
isearch-toggle-regexp and isearch-edit-string to doc string.
2001-01-19 17:13:17 +00:00
Gerd Moellmann
b8fbd47499 (isearch-lazy-highlight-initial-delay)
(isearch-lazy-highlight-interval): Default to 0.
2001-01-17 14:11:06 +00:00
Gerd Moellmann
c982ab2168 (isearch-highlight): Set isearch-overlay priority to
1 here rather than each time through
isearch-lazy-highlight-new-loop.
(isearch-lazy-highlight-max): Variable deleted.
(isearch-lazy-highlight-max-at-a-time): New user variable, like
isearch-lazy-highlight-max but controls a single invocation of
isearch-lazy-highlight-update.
(isearch-lazy-highlight-wrapped): Variable recreated.
(isearch-lazy-highlight-window-start): New variable.
(isearch-lazy-highlight-cleanup): Restored to behavior of
before 2-Jan.
(isearch-lazy-highlight-remove-overlays): Function deleted;
behavior folded into isearch-lazy-highlight-cleanup.  "Keep"
behavior removed.
(isearch-lazy-highlight-new-loop): Restore old behavior of calling
isearch-lazy-highlight-update in a loop rather than just once.
Test isearch-invalid-regexp here and decide not to start a new
loop, rather than testing it each time through
isearch-lazy-highlight-update.
(isearch-lazy-highlight-search): Function restored.
(isearch-lazy-highlight-update): Get called in a timer loop again,
but this time highlight more than one match each time through.
Only highlight matches in the visible part of the window.  Start
at point, move in the direction of the search, and wrap around at
the edge of the window.  Use sit-for to force redisplay and ensure
window-start is credible.  "Face suppressing" behavior removed;
overlay priorities should make it unnecessary, right?
(isearch-highlight): Face suppressing behavior removed.
(isearch-dehighlight): Face suppressing behavior removed.
(isearch-set-lazy-highlight-faces-at): Removed.
2001-01-17 14:10:25 +00:00
Dave Love
39f2174e95 (isearch-lazy-highlight): Add :version. 2001-01-16 17:27:20 +00:00
Gerd Moellmann
c5348233d2 (isearch-search): In the condition-case handler for
`error', set isearch-invalid-regexp to the whole error message.
2001-01-11 15:31:12 +00:00
Richard M. Stallman
7742ee1924 (isearch-lazy-highlight-update):
Don't look for more potential matches once maximum is exceeded.
Use overlays-in to check correctly for overlap with current match.
Ignore empty matches.
2001-01-11 08:08:51 +00:00
Gerd Moellmann
d196f58d91 (isearch-done): Set isearch-lazy-highlight-start
to nil.
2001-01-10 17:20:35 +00:00
Eli Zaretskii
29910493a8 (isearch, isearch-lazy-highlight-face): New
definitions for face colors and attributes.
2001-01-09 11:38:12 +00:00
Gerd Moellmann
7e56ea04ca (isearch-old-signal-hook): Removed.
(isearch-mode): Add isearch-done to kbd-macro-termination-hook
instead of setting signal-hook-function.
(isearch-done): Remove isearch-done from kbd-macro-termination-hook.
2001-01-08 12:26:23 +00:00
Eli Zaretskii
380866a2a5 (isearch-lazy-highlight-remove-overlays): Doc fix.
(isearch-lazy-highlight-update): Doc fix.
2001-01-06 19:04:32 +00:00
Gerd Moellmann
1f4139d5ae (isearch-old-signal-hook): New variable.
(isearch-mode): Set signal-hook-function to isearch-done.
(isearch-done): Restore old signal-hook-function.
----------------------------
2001-01-05 14:41:53 +00:00
Richard M. Stallman
67ecad4e09 Do highlighting of alternative matches all at once,
but only do it in the text that's visible in the selected window.

(isearch-lazy-highlight-cleanup): Arg now says
to remove all the current alternative-match highlighting.
If nil, remove only what's outside the current window.
(isearch-lazy-highlight-remove-overlays): Take optional
region within which NOT to remove them.
(isearch-lazy-highlight-new-loop): Greatly simplified.
(isearch-lazy-highlight-update): Find all the other occurrences
visible in the window, in just one call.

(isearch-lazy-highlight-start): Now holds start of region to scan.
(isearch-lazy-highlight-end): Now holds end of region to scan.
(isearch-lazy-highlight-wrapped): Variable deleted.
(isearch-lazy-highlight-search): Function deleted.
2001-01-03 00:18:53 +00:00
Gerd Moellmann
68ebbb959e (isearch-lazy-highlight-max): New user-option.
(isearch-lazy-highlight-update): Don't highlight more than
isearch-lazy-highlight-max matches.
2000-12-15 13:22:21 +00:00
Miles Bader
ae1a21c634 (isearch-original-minibuffer-message-timeout): New var.
(isearch-mode): Set `minibuffer-message-timeout' to nil, after
stashing away its original value.
(isearch-edit-string): Temporarily restore `minibuffer-message-timeout'
in the recursive edit.
Bind `isearch-original-minibuffer-message-timeout' to protect it.
(isearch-done): Restore `minibuffer-message-timeout'.
2000-11-22 01:36:08 +00:00
Stefan Monnier
02b2f510d0 (isearch-mode-map): Fix docstring. Init in defvar.
(minibuffer-local-isearch-map): Init in defvar.  Use inheritance.
(isearch-clean-overlays, isearch-range-invisible, isearch-unread):
Use mapc rather than map.
2000-11-21 21:28:05 +00:00
Miles Bader
4fb2ad9831 (isearch-set-lazy-highlight-faces-at): New function.
(isearch-highlight): Restore lazy-isearch face properties at old
  position, and suppress them at new position.
(isearch-dehighlight): Restore lazy-isearch face properties.
(isearch-lazy-highlight-update): Add lazy-isearch overlays even
  over the real isearch overlay, but in that case, don't give it a
  face property.  Use `push'.
2000-10-12 07:39:14 +00:00
Gerd Moellmann
45c477b462 (isearch-lazy-highlight-update): Don't put a lazy
highlighting overlay with a different face over the overlay
isearch uses to highlight the current match because that can lead
to bad face combinations.
2000-10-02 19:51:03 +00:00
Gerd Moellmann
18ca20aa86 (isearch-faces): New custom group.
(isearch): New defface; was already tested for in the code.
(isearch-lazy-highlight-face): Changed to defface from defcustom.
(isearch-highlight): Always use face `isearch'.
2000-10-02 19:18:09 +00:00
Stefan Monnier
143736774c (isearch-text-char-description): Pointless rewrite. 2000-09-29 02:35:56 +00:00
Gerd Moellmann
c40a4de1df (isearch-resume): New function.
(isearch-done): Add something to command-history to resume
the search.
(isearch-yank-line, isearch-yank-word): Use
buffer-substring-no-properties instead of buffer-substring.
2000-07-26 14:48:00 +00:00
Kenichi Handa
ed5c183bc9 (isearch-other-meta-char): Fix previous change. 2000-06-02 03:19:24 +00:00
Stefan Monnier
c5def0db86 (isearch-highlight): Turn internal-find-face into facep. 2000-06-02 00:48:43 +00:00
Kenichi Handa
a5cc922e6a (isearch-update): Set disable-point-adjustment to t
to prevent the point moving to the end of a composition when a
part of a composition is searched.
(isearch-other-meta-char): If the key invoking this command can be
mapped by function-key-map to a printing char, call
isearch-process-search-char directly.
2000-06-01 06:22:31 +00:00
Kenichi Handa
3c487103b8 (isearch-printing-char): If keyboard coding system is
being used, call isearch-process-search-multibyte-characters.
2000-05-31 03:49:22 +00:00
Gerd Moellmann
1ea1fb7e14 (isearch-mode-map): Define M-C-s like C-s and M-C-r
like C-r.
2000-04-04 21:04:34 +00:00
Dave Love
3cf0730529 (isearch-highlight): Use display-color-p. 2000-03-12 14:42:58 +00:00
Gerd Moellmann
44336afbad Add lazy highlighting. 1999-11-11 13:39:21 +00:00
Gerd Moellmann
b7b66466a9 (isearch-ring-advance-edit, isearch-complete-edit):
Use delete-field instead of erase-field.
1999-11-04 20:43:05 +00:00
Gerd Moellmann
3157c24a8e (isearch-complete-edit, isearch-ring-advance-edit):
Use erase-field instead of erase-buffer.
1999-11-03 16:26:28 +00:00
Dave Love
117132a6a6 (isearch): Add :links in defgroup.
(isearch-mode-map): Bind mouse-2 to isearch-mouse-yank.
(isearch-switch-frame-handler): Comment out (unused).
(isearch-yank-x-selection, isearch-ring-advance-edit): Doc fix.
(isearch-ring-retreat-edit): Doc fix.
(isearch-mouse-yank): New command.
(isearch-last-command-char): Removed.  Callers changed to use
last-command-char.
(isearch-char-to-string): Removed.  Callers changed to use
char-to-string.
1999-09-27 22:15:50 +00:00
Richard M. Stallman
e952bf4445 (isearch-mode-map): Undo previous change. 1999-09-12 03:40:44 +00:00
Dave Love
c9961ecaeb (isearch-mode-map): Add mouse-2. 1999-09-06 21:33:27 +00:00
Richard M. Stallman
8f3c1d763f (isearch-process-search-char): Write octal 200 correctly. 1999-07-05 16:49:22 +00:00
Richard M. Stallman
3c75023fda (isearch-quote-char): Call unibyte-char-to-multibyte for \200...\240 also.
(isearch-printing-char): Use unibyte-char-to-multibyte.
1999-07-03 19:45:04 +00:00
Richard M. Stallman
df01192be7 (isearch-done): If search ends in middle of intangible
text (due to text property), move on to the limit of that text.
1999-07-02 12:53:04 +00:00
Kenichi Handa
c20d35d515 (isearch-quote-char): Don't assume character codes
0200 - 0237 stand for characters in some single-byte character
charset.
1999-05-28 00:16:09 +00:00
Karl Heuer
ec0a2f45a2 (isearch-search-and-update): Properly
handle upper case letters in the reverse-search special case.
1998-09-25 16:53:04 +00:00
Karl Heuer
8617e346f1 (isearch-forward): Doc fix. 1998-08-26 18:13:55 +00:00
Richard M. Stallman
dcb6bf2b6f (search-whitespace-regexp): Doc fix. 1998-08-18 07:45:27 +00:00
Kenichi Handa
99848db078 (isearch-input-method-function): New variable.
(isearch-input-method-local-p): New variable.
(isearch-mode): Setup the above two variable.  Set
input-method-function to nil locally.
(isearch-done): Restore the previous value of
input-method-function.
1998-07-19 05:17:35 +00:00
Kenichi Handa
52e3ccbf8d (isearch-mode-map): Make all multibyte characters
search for themselves.
1998-07-06 06:33:55 +00:00
Andreas Schwab
5786b3ed4c (search-upper-case): Use `other' widget type. 1998-06-24 09:13:36 +00:00
Kenichi Handa
de207f5af3 (isearch-range-invisible): Handle the case that
buffer-invisibility-spec is t (i.e. not a list).
1998-06-20 02:59:51 +00:00
Richard M. Stallman
57ff063d0b (isearch-yank-x-selection): Doc fix. 1998-04-27 22:05:53 +00:00
Richard M. Stallman
bd6a841426 (isearch-*-char): Do nothing special if quoted with \. 1998-03-05 02:28:44 +00:00
Richard M. Stallman
7e97482bb7 (isearch-range-invisible): Avoid infinite loop when search-invisible is nil. 1998-02-02 00:18:33 +00:00
Richard M. Stallman
6b0f9bdfdd (isearch-mode-map): Don't count above 256
when setting up printing characters.
1997-12-21 02:33:57 +00:00
Karl Heuer
9cf081fa5c (isearch-yank-string): New helper function.
(isearch-yank-kill, isearch-yank-word, isearch-yank-line): Use it.
(isearch-yank-x-selection): New function.
(isearch-yank): Function deleted.
1997-11-18 22:31:16 +00:00
Karl Heuer
45b94eb2e9 (isearch-printing-char): Change S-SPC to SPC.
(isearch-mode-map): Bind S-SPC like SPC.
1997-10-15 23:15:09 +00:00
Richard M. Stallman
e2b992cbc6 (search-whitespace-regexp): Doc fix. 1997-09-05 23:33:10 +00:00
Richard M. Stallman
af56433dc5 (isearch-printing-char): Handle nonascii-insert-offset. 1997-08-28 00:33:03 +00:00
Kenichi Handa
5b56d4e4bd (isearch-multibyte-characters-flag): Deleted.
(isearch-mode): Do not bind isearch-multibyte-characters-flag and
isearch-input-method.
(isearch-printing-char): Use current-input-method instead of
isearch-input-method.
(isearch-message-prefix): Likewise.
1997-08-18 10:53:05 +00:00
Richard M. Stallman
8bc15fa853 (isearch-quote-char): Fix handling of control
characters, copied from quoted-insert.
1997-08-04 19:03:37 +00:00
Richard M. Stallman
4fd017e78e (isearch-other-meta-char): Don't switch windows to exit
if that would switch to an inactive minibuffer.
1997-08-04 05:09:49 +00:00
Richard M. Stallman
68c18d6d0a (isearch-hide-immediately): Doc fix. 1997-08-01 04:53:34 +00:00
Richard M. Stallman
79c7a4fa5f (search-invisible): Fix typo.
(isearch-search): Bind inhibit-point-motion-hooks because we might
have to search inside invisible and intangible text.
(isearch-open-overlay-temporary): Delete forgoten debug message.
(isearch-range-invisible): Fix typo in doc-string.
1997-07-19 05:34:23 +00:00
Richard M. Stallman
92d874e687 (isearch-char-to-string): Use char-to-string.
(isearch-quote-char): Add nonascii-insert-offset.
1997-07-15 00:23:03 +00:00
Kenichi Handa
8c5d9782ec (isearch-message-prefix): Adjusted
for the previous change of variables related to input methods.
1997-07-10 06:44:55 +00:00
Richard M. Stallman
d64b1d967b (isearch-search-and-update): When a reverse search
need not actually search, update isearch-case-fold-search anyway.
(isearch-mode-map): Define latin-iso8859-9 as self-searching.
1997-06-25 03:45:38 +00:00
Richard M. Stallman
0352b20571 (isearch-hide-immediately): New variable.
(isearch-close-unecessary-overlays): New function.
(isearch-range-invisible): Use them.

(search-invisible): Changed the semantics,
the default value and updated the doc string.
(isearch-opened-overlays): New variable.
(isearch-mode): Initialize it.
(isearch-switch-frame-handler): Call isearch-clean-overlays.
(isearch-exit, isearch-cancel, isearch-abort): Likewise.
(isearch-other-meta-char, isearch-search):
Support the new meaning for search-invisible.
(isearch-open-necessary-overlays, isearch-open-overlay-temporary)
(isearch-clean-overlays): New functions.
(isearch-range-invisible): If we are inside overlays that can be
opened, open them, add them to isearch-opened-overlays and say
that the range is visible.
1997-06-13 21:30:38 +00:00
Richard M. Stallman
30178dde79 (search-highlight): Make it t by default.
(search-invisible): Doc fix.
1997-05-30 05:15:48 +00:00
Richard M. Stallman
01a6ef79ef (isearch-process-search-char): Use multibyte
characters to represent themselves.

(isearch-mode-map): Make Latin-4 characters search for themselves.
Use aset to set up these char sets.
1997-05-14 03:53:43 +00:00
Richard M. Stallman
280e8e043d (isearch-mode-map): Treat Latin-1, Latin-2 an Latin-3
chars as printing characters.
1997-05-12 23:18:40 +00:00
Richard M. Stallman
9c1db9293c Use defgroup and defcustom. 1997-05-03 22:35:40 +00:00
Karl Heuer
fd543be59d (isearch-yank): Handle case when CHUNK is `x-sel'. 1997-03-08 19:08:39 +00:00
Karl Heuer
f46d509102 (isearch-mode-map): Define
isearch-toggle-input-method and
isearch-toggle-specified-input-method in the map.
(isearch-multibyte-characters-flag): New variable.
(isearch-mode): Initialize it to nil.
(isearch-printing-char): Handle multibyte characters.
(isearch-message-prefix): Include title of input method if
necessary in the prefix of message.
1997-02-20 05:46:22 +00:00
Richard M. Stallman
86bfaffe40 (isearch-search): Refuse to match invisible text.
(isearch-range-invisible): New function.
(search-invisible): New user option.
1997-02-10 09:41:31 +00:00
Richard M. Stallman
e900ced401 (isearch-edit-string): When we try the search
at the end, do that outside of the let which binds all the
search state.
1996-12-20 05:58:41 +00:00
Richard M. Stallman
2ff20b7e81 (isearch-ring-adjust): Don't pop the state at the start.
Push the state at the end, not in the middle.
1996-12-17 20:24:43 +00:00
Richard M. Stallman
d7fa5aa239 Change defconsts to defvars. 1996-12-16 01:33:02 +00:00