Isearch-related changes.

1 files changed, 30 insertions, 23 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 53a8d9f0fdf..394e0b5b486 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -343,12 +343,12 @@ similarly, using the file displayed on the current line.
 
 *** A list of regexp default values is available via M-n for `occur',
 `keep-lines', `flush-lines' and `how-many'.  This list includes the active
-region in transient-mark-mode, the word under the cursor, the last isearch
-regexp, the last isearch string and the last replacement regexp.
+region in transient-mark-mode, the word under the cursor, the last Isearch
+regexp, the last Isearch string and the last replacement regexp.
 
-*** isearch started in the minibuffer searches in the minibuffer history.
-Reverse isearch commands (C-r, C-M-r) search in previous minibuffer
-history elements, and forward isearch commands (C-s, C-M-s) search in
+*** Isearch started in the minibuffer searches in the minibuffer history.
+Reverse Isearch commands (C-r, C-M-r) search in previous minibuffer
+history elements, and forward Isearch commands (C-s, C-M-s) search in
 next history elements.  When the reverse search reaches the first history
 element, it wraps to the last history element, and the forward search
 wraps to the first history element.  When the search is terminated, the
@@ -409,10 +409,6 @@ vertically and horizontally.
 
 ** Miscellaneous changes:
 
-*** New keymap `search-map' bound to `M-s' provides global bindings
-for search related commands: `M-s o' for `occur', `M-s h r' for
-`highlight-regexp' and other hi-lock commands on the `M-s h' prefix.
-
 *** C-l is bound to the new command recenter-top-bottom, rather than recenter.
 This moves the current line to window center, top and bottom on
 successive invokations.
@@ -690,15 +686,23 @@ position of point in help window (for example in `view-lossage').
 
 ** Isearch
 
-*** New command `isearch-highlight-regexp' bound to `M-s h r'
-in isearch mode runs `highlight-regexp' (`hi-lock-face-buffer')
-with the current search string as its regexp argument.
+*** New command `isearch-forward-word' bound globally to `M-s w' starts
+incremental word search.  New command `isearch-toggle-word' bound to the
+same key `M-s w' in Isearch mode toggles word searching on or off
+while Isearch is active.
+
+*** New command `isearch-highlight-regexp' bound to `M-s h r' in Isearch
+mode runs `highlight-regexp' (`hi-lock-face-buffer') with the current
+search string as its regexp argument.  The same key `M-s h r' and
+other keys on the `M-s h' prefix are bound globally to the command
+`highlight-regexp' and other hi-lock commands.
 
-*** New command `isearch-occur' bound to `M-s o' in isearch mode
-runs `occur' with the current search string.
+*** New command `isearch-occur' bound to `M-s o' in Isearch mode
+runs `occur' with the current search string.  The same key `M-s o'
+is bound globally to the command `occur'.
 
-*** isearch can now search through multiple ChangeLog files.
-When running isearch in a ChangeLog file, if the search fails,
+*** Isearch can now search through multiple ChangeLog files.
+When running Isearch in a ChangeLog file, if the search fails,
 then another C-s tries searching the previous ChangeLog,
 if there is one (e.g. go from ChangeLog to ChangeLog.12).
 This is enabled if multi-isearch-search is non-nil.
@@ -707,13 +711,13 @@ This is enabled if multi-isearch-search is non-nil.
 for buff-menu.el and ibuffer.el are bound to the keys `M-s a C-s' and
 `M-s a M-C-s'.
 
-*** The part of an isearch that failed to match is highlighted in `isearch-fail'
+*** The part of an Isearch that failed to match is highlighted in `isearch-fail'
 face.
 
-*** `C-h C-h' in isearch mode displays isearch-specific Help screen,
-`C-h b' displays all isearch key bindings, `C-h k' displays the full
-documentation of the given isearch key sequence, `C-h m' displays
-documentation of isearch mode.  All the rest Help commands exit isearch mode
+*** `C-h C-h' in Isearch mode displays isearch-specific Help screen,
+`C-h b' displays all Isearch key bindings, `C-h k' displays the full
+documentation of the given Isearch key sequence, `C-h m' displays
+documentation of Isearch mode.  All the rest Help commands exit Isearch mode
 and execute their global definitions.
 
 *** When started in the minibuffer, Isearch searches in the minibuffer
@@ -1087,7 +1091,7 @@ are available for inserting into the minibuffer by typing `M-n'.
 For empty input these functions return the first element of this list.
 
 *** New function `read-regexp' uses the regexp history and some useful
-regexp defaults (string at point, last isearch/replacement regexp/string)
+regexp defaults (string at point, last Isearch/replacement regexp/string)
 via M-n when reading a regexp in the minibuffer.
 
 *** minibuffer-local-must-match-filename-map is now named
@@ -1116,7 +1120,10 @@ function to use for searching in `query-replace-regexp',
 `replace-regexp', `query-replace-regexp-eval', and
 `map-query-replace-regexp'.
 
-*** The new keymap `multi-query-replace-map' contains additonal keys bound
+*** New keymap `search-map' bound to `M-s' provides global bindings
+for search related commands.
+
+*** New keymap `multi-query-replace-map' contains additonal keys bound
 to `automatic-all' and `exit-current' for multi-buffer interactive replacement.
 
 *** The variable `inhibit-changing-match-data', if non-nil, prevents