summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-02-13 11:02:28 +0200
committerEli Zaretskii <eliz@gnu.org>2016-02-13 11:02:28 +0200
commitd97f522d3d3fa18eba2962d53e6c197ace938cc2 (patch)
tree24aff6f4bf881cd60e68bbd014d36d1e8760a286 /doc/emacs
parentb55f06d83d0b59524405213eb6e26e85d4c8599c (diff)
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.
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/display.texi5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 1b75a15427..e3b24033a1 100644
--- 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}