(help-for-help-internal): Add `r' in doc string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2552cbf9c97bda891a9fa8a325ce4a8311df4586..78362e1e108e4f4201c93b25eadcd1aad2f02136 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-10  Romain Francoise  <romain@orebokech.com>
+
+       * help.el (help-for-help-internal): Add `r' in doc string.
+
 2005-12-10  Johan Bockg\e,Ae\e(Brd  <bojohan@dd.chalmers.se>
 
        * align.el (align-regexp, align-highlight-rule): Use
@@ -5,7 +9,7 @@
        repetition (with `repeat-complex-command') recomputes the region
        bounds.
 
-2005-12-10  Lennart Borgman <lennart.borgman.073@student.lu.se>
+2005-12-10  Lennart Borgman  <lennart.borgman.073@student.lu.se>
 
        * window.el (bw-get-tree, bw-get-tree-1, bw-find-tree-sub)
        (bw-find-tree-sub-1, bw-l, bw-t, bw-r, bw-b, bw-dir, bw-eqdir)
@@ -14,11 +18,11 @@
 
 2005-12-10  David Koppelman  <koppel@ece.lsu.edu>
 
-       * hi-lock.el: (hi-lock-mode) Renamed from hi-lock-buffer-mode; 
+       * hi-lock.el: (hi-lock-mode) Renamed from hi-lock-buffer-mode;
        react if global-hi-lock-mode seems intended.
        (global-hi-lock-mode) Renamed from hi-lock-mode.
        (hi-lock-archaic-interface-message-used)
-       (hi-lock-archaic-interface-deduce): New variables.  
+       (hi-lock-archaic-interface-deduce): New variables.
        (turn-on-hi-lock-if-enabled, hi-lock-line-face-buffer)
        (hi-lock-face-buffer, hi-lock-face-phrase-buffer)
        (hi-lock-find-patterns, hi-lock-font-lock-hook): Replace
@@ -78,7 +82,7 @@
 2005-12-09  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * files.el (save-buffer):
-       * international/ucs-tables.el (ucs-set-table-for-input): 
+       * international/ucs-tables.el (ucs-set-table-for-input):
        * mail/mail-extr.el (mail-extract-address-components):
        * mail/sendmail.el (mail-mode): Reformat doc string.
 
@@ -278,7 +282,7 @@
 2005-12-08  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
        * progmodes/cc-mode.el: Give c-hungry-backspace and
-         c-hungry-delete-forward permanent key bindings.
+       c-hungry-delete-forward permanent key bindings.
 
        * progmodes/cc-cmds.el (c-electric-semi&comma): Bind
        c-syntactic-context for calls to "criteria functions", for

diff --git a/lisp/help.el b/lisp/help.el
index 9a779f14d0cf185705e59f2366c5f65057165482..02040007f6ef80b31e750132941e586e14bdc252 100644 (file)
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -178,7 +178,7 @@ specifies what to do when the user exits the help buffer."
 (defalias 'help-for-help 'help-for-help-internal)
 ;; It can't find this, but nobody will look.
 (make-help-screen help-for-help-internal
-  "a b c C e f F i I k C-k l L m p s t v w C-c C-d C-f C-n C-p C-t C-w . or ? :"
+  "a b c C e f F i I k C-k l L m p r s t v w C-c C-d C-f C-n C-p C-t C-w . or ? :"
   "You have typed %THIS-KEY%, the help character.  Type a Help option:
 \(Use SPC or DEL to scroll through this text.  Type \\<help-map>\\[help-quit] to exit the Help command.)
 
@@ -217,6 +217,7 @@ m  describe-mode.  Display documentation of current minor modes,
        and the current major mode, including their special commands.
 n  view-emacs-news.  Display news of recent Emacs changes.
 p  finder-by-keyword. Find packages matching a given topic keyword.
+r  info-emacs-manual.  Display the Emacs manual in Info mode.
 s  describe-syntax.  Display contents of syntax table, plus explanations.
 S  info-lookup-symbol.  Display the definition of a specific symbol
         as found in the manual for the language this buffer is written in.