Document deprecation of hi-lock-mode's 'C-x w' bindings

* doc/emacs/display.texi (Highlight Interactively): Deprecate the
"C-x w" bindings of hi-lock-mode.

* etc/NEWS: Mark the deprecation entry as documented.

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 1b75a15427c5c87d53d56f5a69f89bf75447756f..e3b24033a1ae63b1956984e1fb4b488f4c492e5d 100644 (file)
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -924,7 +924,10 @@ mode for all buffers, use @kbd{M-x global-hi-lock-mode} or place
 
   Hi Lock mode works like Font Lock mode (@pxref{Font Lock}), except
 that you specify explicitly the regular expressions to highlight.  You
-control them with these commands:
+control them with the commands described below.  (The key bindings
+below that begin with @kbd{C-x w} are deprecated in favor of the
+global @kbd{M-s h} bindings, and will be removed in some future Emacs
+version.)
 
 @table @kbd
 @item M-s h r @var{regexp} @key{RET} @var{face} @key{RET}

diff --git a/etc/NEWS b/etc/NEWS
index 4eec4a6642fd1441f629927afb40e6a08d2e8af7..f4ea3a05ab2cb944b00cf429a23a322f70aa6b1a 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -321,6 +321,7 @@ default.
 unsaved customizations and prompts user to customize (if found).  It
 is intended for adding to 'kill-emacs-query-functions'.
 
++++
 ** The old `C-x w' bindings in hi-lock-mode are officially deprecated
 in favor of the global `M-s h' bindings introduced in Emacs-23.1.
 They'll disappear soon.