*** empty log message ***

4 files changed, 8 insertions, 14 deletions

diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 5a199d5a58e..f9bb8adf3b6 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -156,7 +156,7 @@ electric-buffer-menu-mode-hook if it is non-nil."
     (fillarray (lookup-key map "\e") 'Electric-buffer-menu-undefined)
     (define-key map "\C-z" 'suspend-emacs)
     (define-key map "v" 'Electric-buffer-menu-mode-view-buffer)
-    (define-key map help-char 'Helper-help)
+    (define-key map (char-to-string help-char) 'Helper-help)
     (define-key map "?" 'Helper-describe-bindings)
     (define-key map "\C-c" nil)
     (define-key map "\C-c\C-c" 'Electric-buffer-menu-quit)
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 840244813c3..80e8bed764b 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -63,7 +63,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
   (define-key electric-history-map "\C-c\C-c" 'Electric-history-quit)
   (define-key electric-history-map "\C-]" 'Electric-history-quit)
   (define-key electric-history-map "\C-z" 'suspend-emacs)
-  (define-key electric-history-map "\C-h" 'Helper-help)
+  (define-key electric-history-map help-char 'Helper-help)
   (define-key electric-history-map "?" 'Helper-describe-bindings)
   (define-key electric-history-map "\e>" 'end-of-buffer)
   (define-key electric-history-map "\e<" 'beginning-of-buffer)
@@ -131,7 +131,7 @@ The Command History listing is recomputed each time this mode is invoked."
 (defun Electric-history-undefined ()
   (interactive)
   (ding)
-  (message "Type C-h for help, ? for commands, C-c to quit, Space to execute")
+  (message (substitute-command-keys "Type \\[Help-for-help] for help, ? for commands, C-c to quit, Space to execute"))
   (sit-for 4))
 
 (defun Electric-history-quit ()
diff --git a/lisp/help.el b/lisp/help.el
index 34b3db6882b..29cf96e42fc 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -26,13 +26,10 @@
 (defvar help-map (make-sparse-keymap)
   "Keymap for characters following the Help key.")
 
-(defvar help-key "\C-h"
-  "*Key used to invoke electric help.")
-
 (define-key global-map help-key 'help-command)
 (fset 'help-command help-map)
 
-(define-key help-map help-key 'help-for-help)
+(define-key help-map help-char 'help-for-help)
 (define-key help-map "?" 'help-for-help)
 
 (define-key help-map "\C-c" 'describe-copying)
@@ -230,17 +227,17 @@ C-d print Emacs ordering information.
 C-n print news of recent Emacs changes.
 C-w print information on absence of warranty for GNU Emacs."
   (interactive)
-  (message
- "A B C F I K L M N S T V W C-c C-d C-n C-w.  Type \\[help-for-help] again for more help: ")
+  (message (substitute-command-keys
+ "A B C F I K L M N S T V W C-c C-d C-n C-w.  Type \\[help-for-help] again for more help: "))
   (let ((char (read-char)))
-    (if (or (= char ?\C-h) (= char ??))
+    (if (or (= char help-char) (= char ??))
         (save-window-excursion
           (switch-to-buffer "*Help*")
           (delete-other-windows)
           (erase-buffer)
           (insert (documentation 'help-for-help))
           (goto-char (point-min))
-          (while (memq char '(?\C-h ?? ?\C-v ?\  ?\177 ?\M-v))
+          (while (memq char (cons help-char '(?? ?\C-v ?\  ?\177 ?\M-v)))
             (if (memq char '(?\C-v ?\ ))
                 (scroll-up))
             (if (memq char '(?\177 ?\M-v))
diff --git a/lisp/hexl.el b/lisp/hexl.el
index dce544dcb84..13ce5f5259f 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -67,9 +67,6 @@ and \"-de\" when dehexlfying a buffer.")
 (defvar hexl-max-address 0
   "Maximum offset into hexl buffer.")
 
-(defvar help-key "\C-h"
-  "*Key used to invoke electric help.")
-
 (defvar hexl-mode-map nil)
 
 ;; routines