; Improve documentation of 'echo-keystrokes-help'

* doc/emacs/display.texi (Display Custom): Document
'echo-keystrokes-help'.

* etc/NEWS: Mark the 'echo-keystrokes-help' entry documented.

(cherry picked from commit d6c7092ff0713087f38b9492d53be0177af67514)

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 6db9e8344c6a1e27ae3b43614a3b5ffa2a48cd3b..d2557d6148e19b2737d27d2bb7f3036791aa11d8 100644 (file)
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -2210,6 +2210,13 @@ keys; its value is the number of seconds of pause required to cause echoing
 to start, or zero, meaning don't echo at all.  The value takes effect when
 there is something to echo.  @xref{Echo Area}.
 
+@vindex echo-keystrokes-help
+  If the variable @code{echo-keystrokes-help} is non-@code{nil} (the
+default), the multi-character key sequence echo shown according to
+@code{echo-keystrokes} will include a short help text about keys which
+will invoke @code{describe-prefix-bindings} (@pxref{Misc Help}) to show
+the list of commands for the prefix you already typed.
+
 @cindex mouse pointer
 @cindex hourglass pointer display
 @vindex display-hourglass

diff --git a/etc/NEWS b/etc/NEWS
index dc62fdbb9bfdf010de9ca9c0642371c1ba477f95..661267a015025ba52cb9d7d7c9160b36ff67707b 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -305,7 +305,8 @@ between the auto save file and the current file.
 ** 'ffap-lax-url' now defaults to nil.
 Previously, it was set to t but this broke remote file name detection.
 
-** Unfinished commands' echo now ends with a suggestion to use Help.
++++
+** Multi-character key echo now ends with a suggestion to use Help.
 Customize 'echo-keystrokes-help' to nil to prevent that.
 
 \f