*** empty log message ***

2 files changed, 14 insertions, 8 deletions

diff --git a/lisp/info.el b/lisp/info.el
index fef0d9b47c3..996c35152d6 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -893,7 +893,7 @@ At end of the node's text, moves to the next node."
   (define-key Info-mode-map "q" 'Info-exit)
   (define-key Info-mode-map "s" 'Info-search)
   (define-key Info-mode-map "u" 'Info-up)
-  (define-key Info-mode-map "\177" 'scroll-down)
+  (define-key Info-mode-map "\177" 'Info-scroll-down)
   )
 
 ;; Info mode is suitable only for specially formatted data.
@@ -919,8 +919,11 @@ Selecting other nodes:
 \\[Info-last]   Move to the last node you were at.
 
 Moving within a node:
-\\[scroll-up]   scroll forward a full screen.     \\[scroll-down]  scroll backward.
-\\[beginning-of-buffer] Go to beginning of node.
+\\[scroll-up]   Normally, scroll forward a full screen.  If the end of the buffer is
+already visible, try to go to the next menu entry, or up if there is none.
+\\[scroll-down]  Normally, scroll backward.  If the beginning of the buffer is
+already visible, try to go to the previous menu entry, or up if there is none.
+\\[beginning-of-buffer] Go to beginning of node.  
 
 Advanced commands:
 \\[Info-exit]   Quit Info: reselect previously selected buffer.
@@ -930,7 +933,10 @@ Advanced commands:
 \\[Info-goto-node]      Move to node specified by name.
         You may include a filename as well, as (FILENAME)NODENAME.
 \\[Info-search] Search through this Info file for specified regexp,
-        and select the node in which the next occurrence is found."
+        and select the node in which the next occurrence is found.
+\\[Info-next-preorder]  Next-preorder; that is, try to go to the next menu item,
+        and if that fails try to move up, and if that fails, tell user
+        he/she is done reading."
   (kill-all-local-variables)
   (setq major-mode 'Info-mode)
   (setq mode-name "Info")
diff --git a/lisp/view.el b/lisp/view.el
index 50dbc77d815..245a4136deb 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -75,7 +75,7 @@
   (define-key view-mode-map "x" 'exchange-point-and-mark)
   (define-key view-mode-map "h" 'Helper-describe-bindings)
   (define-key view-mode-map "?" 'Helper-describe-bindings)
-  (define-key view-mode-map "\C-h" 'Helper-help)
+  (define-key view-mode-map (char-to-string help-char) 'Helper-help)
   (define-key view-mode-map "\C-n" 'next-line)
   (define-key view-mode-map "\C-p" 'previous-line)
   (define-key view-mode-map "\C-s" 'isearch-forward)
@@ -193,7 +193,7 @@ C-r or r	do reverse incremental search.
                   successful search and when jump to line to occurs.
                   The mark is set on jump to buffer start or end.
 ? or h          provide help message (list of commands).
-C-h             provides help (list of commands or description of a command).
+\\[Helper-help]         provides help (list of commands or description of a command).
 C-n             moves down lines vertically.
 C-p             moves upward lines vertically.
 C-l             recenters the screen.
@@ -282,10 +282,10 @@ If you viewed a file that was not present in Emacs, its buffer is killed."
 
 (defun view-helpful-message ()
   (message
-   (if (and (eq (key-binding "\C-h") 'Helper-help)
+   (if (and (eq (key-binding (char-to-string help-char)) 'Helper-help)
             (eq (key-binding "?") 'Helper-describe-bindings)
             (eq (key-binding "\C-c") 'view-exit))
-       "Type C-h for help, ? for commands, C-c to quit"
+       "Type \\[Helper-help] for help, ? for commands, C-c to quit"
      (substitute-command-keys
       "Type \\[Helper-help] for help, \\[Helper-describe-bindings] for commands, \\[view-exit] to quit."))))