[Emacs-diffs] trunk r115632: Document prefix key description in terms of ?

[Tassilo Horn]

------------------------------------------------------------
revno: 115632
revision-id: address@hidden
parent: address@hidden
committer: Tassilo Horn <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-20 14:55:44 +0100
message:
  Document prefix key description in terms of ?
  
  * doc/emacs/help.texi: Document that `?' now also shows subcommands of
  prefix keys.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/help.texi            help.texi-20091113204419-o5vbwnq5f7feedwu-6256
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-12-17 15:57:38 +0000
+++ b/doc/emacs/ChangeLog       2013-12-20 13:55:44 +0000
@@ -1,3 +1,8 @@
+2013-12-20  Tassilo Horn  <address@hidden>
+
+       * help.texi: Document that `?' now also shows subcommands of
+       prefix keys.
+
 2013-12-17  Chong Yidong  <address@hidden>
 
        * killing.texi (Appending Kills): Note that append-next-kill can

=== modified file 'doc/emacs/help.texi'
--- a/doc/emacs/help.texi       2013-07-03 03:20:04 +0000
+++ b/doc/emacs/help.texi       2013-12-20 13:55:44 +0000
@@ -55,11 +55,12 @@
 @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 @@
 
 @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 @address@hidden C-h} is actually
address@hidden, 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
address@hidden ?} work fine.)
 
 @node Help Files
 @section Help Files

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2013-12-20 12:31:20 +0000
+++ b/etc/NEWS  2013-12-20 13:55:44 +0000
@@ -102,6 +102,7 @@
 (Typing M-` will always invoke `tmm-menubar', even if
 `tty-menu-open-use-tmm' is nil.)
 
++++
 ** Key ? also describes prefix bindings like C-h.
 
 +++