1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 03:10:58 -08:00
Commit graph

466 commits

Author SHA1 Message Date
Juri Linkov
8d32ed6416 * isearch.el (isearch-query-replace, isearch-highlight-regexp):
Bind `isearch-recursive-edit' to nil to prevent calling
`exit-recursive-edit' in `isearch-done' that terminates the
execution of these commands when it is non-nil.  Call
`exit-recursive-edit' explicitly at the end.
(isearch-occur): For word search construct the correct regexp
with word boundaries to proceed with occur.
2008-11-11 19:48:37 +00:00
Juri Linkov
8c740e4c10 (isearch-search-fun): Compare the length of the
current search string with the length of the string from the
previous search state to detect the situation when the user
adds or removes characters in the search string.
Use word-search-forward-lax and word-search-backward-lax in this
case, and otherwise word-search-forward and word-search-backward.
2008-11-11 19:43:09 +00:00
Juri Linkov
9d14752f31 (isearch-query-replace, isearch-query-replace-regexp):
Add arg `delimited' as in `query-replace' for the case when
isearch-allow-scroll=t and the user types C-u M-%.  Doc fix.
Add more indicators to the prompt ("word" and "in region").
2008-10-19 22:33:17 +00:00
Chong Yidong
60b1872223 (isearch-search-fun): Use word-search-forward-lax and
word-search-backward-lax for incremental word search.
2008-09-25 17:06:22 +00:00
Chong Yidong
9c7a6b159d (isearch-highlight-regexp): Fix last change, quoting non-alphabetical
characters properly.
2008-09-03 00:01:25 +00:00
Chong Yidong
36bdf1ff3c (isearch-highlight-regexp): Fix case of highlighted string. 2008-08-29 19:15:19 +00:00
Juri Linkov
8938c0bc9c (isearch-forward-regexp, isearch-forward-word)
(isearch-backward, isearch-backward-regexp): Doc fix - make a link
to the command `isearch-forward' instead of displaying "See C-s".
(isearch-highlight-regexp): Remove arguments `regexp' and `face'
with their interactive specifictions.  Move reading the face name to
the main body after calls to isearch-done and isearch-clean-overlays.
2008-07-31 17:19:28 +00:00
Juri Linkov
c16e87ee53 (isearch-edit-string-set-word): New command.
(minibuffer-local-isearch-map): Bind "\C-w" to
isearch-edit-string-set-word.
(isearch-new-word): Temporary internal variable.
(isearch-edit-string): Remove special case of reading the
first character and checking it for C-w.
2008-07-31 16:51:09 +00:00
Juri Linkov
70bc526887 (isearch-mode-map): Bind M-s r' to isearch-toggle-regexp'
and `M-s w' to `isearch-toggle-word'.
(search-map): Bind `M-s w' to `isearch-forward-word' globally
in the global map `search-map'.
(isearch-forward): Doc fix.
(isearch-forward-word, isearch-toggle-case-fold): New commands.
2008-07-30 16:40:48 +00:00
Dan Nicolaescu
9e2a264775 Remove support for Mac Carbon.
* mactoolbox.c:
* macterm.h:
* macterm.c:
* macselect.c:
* macmenu.c:
* macgui.h:
* macfns.c:
* mac.c: Remove file.
* s/darwin.h:
* m/intel386.h:
* xfaces.c:
* xdisp.c:
* window.c:
* tparam.c:
* termhooks.h:
* termcap.c:
* term.c:
* syssignal.h:
* sysselect.h:
* sysdep.c:
* process.c:
* lread.c:
* lisp.h:
* keyboard.c:
* image.c:
* fringe.c:
* frame.h:
* frame.c:
* fontset.c:
* font.h:
* font.c:
* fns.c:
* fileio.c:
* emacs.c:
* dispnew.c:
* dispextern.h:
* config.in:
* atimer.c:
* Makefile.in: Remove code for Carbon

* erc.el: Remove code for Carbon.

Remove support for Mac Carbon.
* term/mac-win.el: Remove file
* international/mule-cmds.el:
* version.el:
* startup.el:
* simple.el:
* mwheel.el:
* mouse.el:
* loadup.el:
* isearch.el:
* info.el:
* frame.el:
* faces.el:
* disp-table.el:
* cus-start.el:
* cus-face.el:
* cus-edit.el:
* Makefile.in: Remove code for Carbon.

Remove support for Mac Carbon.
* makefile.w32-in:
* emacsclient.c: Remove code for Carbon.

* PROBLEMS:
* MACHINES: Remove mentions of Mac Carbon.

* ns-emacs.texi:
* faq.texi: Remove mentions of Mac Carbon.

* os.texi:
* frames.texi:
* display.texi: Remove mentions of Mac Carbon.

* xresources.texi: Remove mentions of Mac Carbon.

* make-tarball.txt:
* admin.el:
* FOR-RELEASE:
* CPP-DEFINES: Remove mentions of Mac Carbon.

Remove support for Mac Carbon.
* mac: Remove directory.
* make-dist:
* configure.in:
* README:
* Makefile.in:
* INSTALL:  Remove code for Carbon.
* configure: Regenerate.
2008-07-27 18:24:48 +00:00
Juri Linkov
3c0aa5e65b (isearch-message-prefix): Display "Multi" when
`multi-isearch-next-buffer-current-function' is non-nil.
(isearch-search-string): Replace `isearch-buffers-next-buffer-function'
with `multi-isearch-next-buffer-current-function', and
`isearch-buffers-current-buffer' with `multi-isearch-current-buffer'.
2008-07-23 23:51:15 +00:00
Juri Linkov
11c9f489a4 (isearch-mode-map): Bind M-s h r' to isearch-highlight-regexp'.
(isearch-highlight-regexp): New function.
2008-06-25 20:22:14 +00:00
Juri Linkov
21d9ed8b07 Put isearch-scroll property on recenter-top-bottom. 2008-05-11 20:30:26 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Stefan Monnier
4f3b3482ee (isearch-search-string): Avoid string-bytes and aset. 2008-04-24 17:59:51 +00:00
Juri Linkov
b92368b471 (eval-when-compile): Require `help-macro'.
(isearch-help-for-help-internal): Isearch specific Help screen
created by `make-help-screen'.
(isearch-help-map): New variable that binds "b", "k", "m" to
isearch-specific commands, and binds other keys to
isearch-other-control-char, thus allowing other Help keys to
exit isearch mode and execute their global definitions.
(isearch-help-for-help, isearch-describe-bindings)
(isearch-describe-key, isearch-describe-mode): New commands.
(isearch-mode-help): Define alias to isearch-describe-mode
and remove its old function definition.
(isearch-mode-map): Bind "\C-h" to isearch-help-map.
Remove old comments because this issue is settled now.
(isearch-forward): Describe three new Help commands in the docstring.
(isearch-mode): Remove \\{isearch-mode-map} from the docstring,
leave the single sentence at the first line of the docstring,
and prepend the word "function" before `isearch-forward'
to make the Help link to the function instead of variable.
2008-04-22 20:32:23 +00:00
Juri Linkov
5e189f398c (isearch-success-function): New variable with default
to `isearch-success-function-default'.
(isearch-search): Call a function from `isearch-success-function'
instead of calling the hard-coded `isearch-range-invisible'.
(isearch-success-function-default): New function that calls
`isearch-range-invisible' and inverts its return value.
2008-04-22 19:56:17 +00:00
Juanma Barranquero
137017094f (isearch-return-char): Add WHEN to obsolescence declaration. 2008-04-18 10:29:23 +00:00
Juri Linkov
363de02ef0 (isearch-edit-string): Use search-ring-yank-pointer
and regexp-search-ring-yank-pointer for the HISTPOS argument of
read-from-minibuffer to provide the correct initial minibuffer
history position in isearch-edit-string when it is called from
isearch-ring-adjust.
2008-03-16 17:44:11 +00:00
Juri Linkov
a71a98cf83 (isearch-edit-string): Remove one call to
`isearch-push-state' not to push an inconsistent state,
but keep another correct call to `isearch-push-state'.
(isearch-ring-adjust): Call `isearch-push-state' only when
`search-ring-update' is non-nil since `isearch-edit-string'
already pushes its state.
(isearch-message): Improve matching the failed part by checking
if the original message starts with the last successful message.
2008-03-14 01:02:45 +00:00
Kenichi Handa
758710cb94 (isearch-printing-char): Don't check
keyboard-coding-system.  Call
isearch-process-search-multibyte-characters only when
current-input-method is non-nil.
2008-02-28 01:58:07 +00:00
Juri Linkov
d8891294b8 (isearch-fail): Use "RosyBrown1" for a light
background, "red4" for a dark background, "red" for 16 and
8 colors, "grey" for grayscale, and inverse video otherwise.
Add :version tag.
(isearch-message): Keep the original isearch-message intact, and
add text properties to it where necessary.  Add `isearch-error' to
the condition that checks if isearch is unsuccessful.
2008-02-25 00:01:54 +00:00
Miles Bader
b03f96dc5a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1074
2008-02-24 10:09:07 +00:00
Bastien Guerry
723e5b84bb * isearch.el:
(isearch-fail): New face.
(isearch-message): Highlight failure part of input.
2008-02-12 00:50:44 +00:00
Juanma Barranquero
9b9a412286 *** empty log message *** 2008-02-05 11:51:30 +00:00
Miles Bader
430d2ee291 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
2008-01-09 01:21:15 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Miles Bader
d29ee6b1a1 Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300
2007-12-16 05:08:49 +00:00
Juri Linkov
6e3057bbed (search-upper-case): Doc fix.
(isearch-mode-map): Bind `M-s o' to isearch-occur.
(isearch-query-replace): Doc fix.  Let-bind search-upper-case to nil.
(isearch-query-replace-regexp): Doc fix.
(isearch-occur): New function.
2007-12-09 23:47:59 +00:00
Miles Bader
f23d76bdef Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
2007-11-11 00:56:44 +00:00
Juri Linkov
4974aba85e (isearch-mode-end-hook, isearch-mode-end-hook-quit):
Fix docstring.  Reported by Leo Liu <sdl.web@gmail.com>.
2007-11-10 23:03:24 +00:00
Juri Linkov
72a69d7f81 (isearch-other-meta-char): Call `isearch-edit-string' when mouse is
clicked on the isearch message.
(isearch-resume): Call `isearch-update' at the end.  Rename argument
`search' to `string' to conform to the isearch terminology.
2007-10-28 14:49:41 +00:00
Miles Bader
18cd1f1a08 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 902-908)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 131-137)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
2007-10-27 09:12:07 +00:00
Juri Linkov
d240f431cb (isearch-search-string): After finding the next
occurrence switch to buffer isearch-buffers-current-buffer when
isearch-buffers-next-buffer-function is non-nil and
isearch-buffers-current-buffer is live.
2007-10-22 23:44:29 +00:00
Miles Bader
ecb21060d5 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 866-879)

   - Merge multi-tty branch
   - Update from CVS
   - Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
2007-10-11 16:14:00 +00:00
Miles Bader
aaf34461ff Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
2007-08-13 13:51:08 +00:00
Miles Bader
b2e6b10fe2 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 846-851)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 88-92)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 242-244)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
2007-08-13 13:48:35 +00:00
Miles Bader
37cc095b6a Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-851
2007-08-13 13:41:28 +00:00
Glenn Morris
4837b516ea Replace `iff' in doc-strings and comments. 2007-08-08 07:40:09 +00:00
Miles Bader
9899d01a0c Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-838)

   - Update from CVS
   - Merge from emacs--rel--22
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Fix void function definition error in cus-edit.el
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * emacs--rel--22  (patch 70-83)

   - Update from CVS
   - Remove lisp/erc/erc-nicklist.el
   - Update some .arch-inventory files
   - Indicate that emacs--devo--0--patch-834 does not need to be applied
   - Merge from gnus--rel--5.10
   - Restore lisp/emacs-lisp/cl-loaddefs.el

 * gnus--rel--5.10  (patch 239-241)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
2007-07-31 05:50:45 +00:00
Miles Bader
e468b87f91 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 824-831)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 70-74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
2007-07-27 10:52:18 +00:00
Miles Bader
9aecacd08a Merge from emacs--rel--22
Patches applied:

 * emacs--rel--22  (patch 70-73)

   - Update from CVS

2007-07-25  Glenn Morris  <rgm@gnu.org>

   * Relicense all FSF files to GPLv3 or later.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
2007-07-26 05:28:10 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Miles Bader
492d9f3e3c Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 814-823)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 59-69)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-26
2007-07-24 01:25:28 +00:00
Miles Bader
d918f936d5 Merge from emacs--devo--0
Patches applied:

 * emacs--devo--0  (patch 816-823)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 59-69)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 237-238)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-235
2007-07-24 01:23:55 +00:00
Juri Linkov
ac475d3a72 (isearch-message-function): New variable.
(isearch-update, isearch-search): Use it.
2007-07-23 20:29:10 +00:00
Juri Linkov
e81ab98642 (isearch-edit-string): Save old point and
isearch-other-end to old-point and old-other-end before reading
the search string from minibuffer.  After exiting minibuffer set
point to old-other-end if point and the search direction is the
same as before reading the search string.
(isearch-del-char): Don't set isearch-yank-flag to t.  Put point
to isearch-other-end.  Instead of isearch-search-and-update call
three functions isearch-search, isearch-push-state and isearch-update.
2007-07-22 22:35:10 +00:00
Juri Linkov
02b99a172e (isearch-edit-string): Save old point and
isearch-other-end to old-point and old-other-end before reading
the search string from minibuffer.  After exiting minibuffer set
point to old-other-end if point and the search direction is the
same as before reading the search string.
(isearch-del-char): Don't set isearch-yank-flag to t.  Put point
to isearch-other-end.  Instead of isearch-search-and-update call
three functions isearch-search, isearch-push-state and isearch-update.
2007-07-22 22:33:48 +00:00
Richard M. Stallman
0a2ea418fc (isearch-mode, isearch-done): Delete unintended code in previous change. 2007-07-15 17:56:23 +00:00