* doc/emacs/windows.texi (Window Convenience): Use @code for windmove.

This refers to both a command and a user option.

* etc/NEWS: Add some ---.

diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 8cb88a209540f9b1019580142c3c415a0ac93c4b..27c754133f71e916141d58d91aa9ff1cb7cd849d 100644 (file)
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -603,16 +603,16 @@ buffer.  @xref{Follow Mode}.
 between neighboring windows in a frame.  @kbd{M-x windmove-right}
 selects the window immediately to the right of the currently selected
 one, and similarly for the left, up, and down counterparts.
-@w{@kbd{M-x windmove-default-keybindings}} binds these commands to
+@code{windmove-default-keybindings} binds these commands to
 @kbd{S-right} etc.; doing so disables shift selection for those keys
 (@pxref{Shift Selection}).  In the same way as keybindings can be
 defined for commands that select windows directionally, you can use
-@w{@kbd{M-x windmove-display-default-keybindings}} to define
-keybindings for commands that specify in what direction to display the
-window for the buffer that the next command is going to display.
-Also there is @w{@kbd{M-x windmove-delete-default-keybindings}} to
-define keybindings for commands that delete windows directionally, and
-@w{@kbd{M-x windmove-swap-states-default-keybindings}} that defines
+@code{windmove-display-default-keybindings} to define keybindings for
+commands that specify in what direction to display the window for the
+buffer that the next command is going to display.  Also there is
+@code{windmove-delete-default-keybindings} to define keybindings for
+commands that delete windows directionally, and
+@code{windmove-swap-states-default-keybindings} that defines
 keybindings for commands that swap the window contents of the selected
 window with the window in the specified direction.
 

diff --git a/etc/NEWS b/etc/NEWS
index e5f114d19453c35daf5f31ab5e17a16dba9419d4..a3628a3ad154c705c02f7971668c5c2aeaaf3f44 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1845,17 +1845,21 @@ These options include 'windmove-default-keybindings',
 'windmove-display-default-keybindings',
 'windmove-delete-default-keybindings',
 'windmove-swap-states-default-keybindings'.
+Also new mode 'windmove-mode' enables the customized keybindings.
 
 ** Occur mode
 
+---
 *** New bindings in occur-mode.
 The command 'next-error-no-select' is now bound to 'n' and
 'previous-error-no-select' is bound to 'p'.
 
+---
 *** The new command 'recenter-current-error'.
 It is bound to 'l' in Occur or compilation buffers, and recenters the
 current displayed occurrence/error.
 
+---
 *** Matches in target buffers are now highlighted as in 'compilation-mode'.
 The method of highlighting is specified by the user options
 'next-error-highlight' and 'next-error-highlight-no-select'.