Document prefix key description in terms of ?

* doc/emacs/help.texi: Document that `?' now also shows subcommands of
prefix keys.

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c5330da779b264125bf4ba11d02f5c1f51b399ab..2a7a03d52784f56db32cad91323b9a07e00fcf01 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-20  Tassilo Horn  <tsdh@gnu.org>
+
+       * help.texi: Document that `?' now also shows subcommands of
+       prefix keys.
+
 2013-12-17  Chong Yidong  <cyd@gnu.org>
 
        * killing.texi (Appending Kills): Note that append-next-kill can

diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index e41d68a5f516dca9e399a74c19bb5050e8a9e5f6..2a31a96c0040933c6eb4478a8292de24275022c5 100644 (file)
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -55,11 +55,12 @@ This displays the available Emacs packages based on keywords.
 @xref{Package Keywords}.
 @end table
 
-  @kbd{C-h} or @key{F1} means ``help'' in various other contexts as
-well.  For instance, you can type them after a prefix key to view a
-list of the keys that can follow the prefix key.  (A few prefix keys
-don't support @kbd{C-h} in this way, because they define other
-meanings for it, but they all support @key{F1} for help.)
+  @kbd{C-h}, @key{F1}, or @kbd{?} means ``help'' in various other
+contexts as well.  For instance, you can type them after a prefix key
+to view a list of the keys that can follow the prefix key.  (A few
+prefix keys don't support @kbd{C-h} or @kbd{?} in this way, because
+they define other meanings for it, but they all support @key{F1} for
+help.)
 
 @menu
 * Help Summary::        Brief list of all Help commands.
@@ -549,11 +550,13 @@ Emacs Lisp Reference Manual}).
 
 @findex describe-prefix-bindings
   You can get a list of subcommands for a particular prefix key by
-typing @kbd{C-h} (@code{describe-prefix-bindings}) after the prefix
-key.  (There are a few prefix keys for which this does not
-work---those that provide their own bindings for @kbd{C-h}.  One of
-these is @key{ESC}, because @kbd{@key{ESC} C-h} is actually
-@kbd{C-M-h}, which marks a defun.)
+typing @kbd{C-h}, @kbd{?}, or @kbd{F1}
+(@code{describe-prefix-bindings}) after the prefix key.  (There are a
+few prefix keys for which not all of these keys work---those that
+provide their own bindings for one of them.  One of these prefix keys
+is @key{ESC} in combination with @kbd{C-h}, because @kbd{ESC C-h} is
+actually @kbd{C-M-h}, which marks a defun.  However, @kbd{ESC F1} and
+@kbd{ESC ?} work fine.)
 
 @node Help Files
 @section Help Files

diff --git a/etc/NEWS b/etc/NEWS
index be72ca58563a4c4f934ee2ac7706d020f5f99aa6..fe2dd14e035e036873d0db21e618854a8190064b 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -102,6 +102,7 @@ customize the option `tty-menu-open-use-tmm' to a non-nil value.
 (Typing M-` will always invoke `tmm-menubar', even if
 `tty-menu-open-use-tmm' is nil.)
 
++++
 ** Key ? also describes prefix bindings like C-h.
 
 +++