# HG changeset patch # User Eric S. Raymond # Date 712878595 0 # Node ID d09aafad0e956e42ff06f51cb6dc50ba9f0a860d # Parent 938f166a0874da8bded1c5891b74e1af5ac523f9 *** empty log message *** diff -r 938f166a0874 -r d09aafad0e95 lisp/dired-aux.el --- a/lisp/dired-aux.el Mon Aug 03 21:32:21 1992 +0000 +++ b/lisp/dired-aux.el Mon Aug 03 21:49:55 1992 +0000 @@ -539,7 +539,7 @@ ;; Query user and return nil or t. ;; Store answer in symbol VAR (which must initially be bound to nil). ;; Format PROMPT with ARGS. - ;; Binding variable help-form will help the user who types C-h. + ;; Binding variable help-form will help the user who types the help key. (let* ((char (symbol-value qs-var)) (action (cdr (assoc char dired-query-alist)))) (cond ((eq 'yes action) diff -r 938f166a0874 -r d09aafad0e95 lisp/ebuff-menu.el --- a/lisp/ebuff-menu.el Mon Aug 03 21:32:21 1992 +0000 +++ b/lisp/ebuff-menu.el Mon Aug 03 21:49:55 1992 +0000 @@ -29,9 +29,6 @@ (require 'electric) -(defvar help-key "\C-h" - "*Key used to invoke electric help.") - ;; this depends on the format of list-buffers (from src/buffer.c) and ;; on stuff in lisp/buff-menu.el @@ -159,7 +156,7 @@ (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-key 'Helper-help) + (define-key map 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 -r 938f166a0874 -r d09aafad0e95 lisp/help.el --- a/lisp/help.el Mon Aug 03 21:32:21 1992 +0000 +++ b/lisp/help.el Mon Aug 03 21:49:55 1992 +0000 @@ -26,10 +26,13 @@ (defvar help-map (make-sparse-keymap) "Keymap for characters following the Help key.") -(define-key global-map "\C-h" 'help-command) +(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 "\C-h" 'help-for-help) +(define-key help-map help-key 'help-for-help) (define-key help-map "?" 'help-for-help) (define-key help-map "\C-c" 'describe-copying) @@ -200,7 +203,7 @@ (print-help-return-message))) (defun help-for-help () - "You have typed C-h, the help character. Type a Help option: + "You have typed \\[help-for-help], the help character. Type a Help option: A command-apropos. Give a substring, and see a list of commands (functions interactively callable) that contain @@ -228,7 +231,7 @@ 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 C-h again for more help: ") + "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 ??)) (save-window-excursion diff -r 938f166a0874 -r d09aafad0e95 lisp/hexl.el --- a/lisp/hexl.el Mon Aug 03 21:32:21 1992 +0000 +++ b/lisp/hexl.el Mon Aug 03 21:49:55 1992 +0000 @@ -589,8 +589,8 @@ (define-key hexl-mode-map "\C-e" 'hexl-end-of-line) (define-key hexl-mode-map "\C-f" 'hexl-forward-char) - (if (not (eq (key-binding help-key) 'help-command)) - (define-key hexl-mode-map help-key 'undefined)) + (if (not (eq (key-binding help-char) 'help-command)) + (define-key hexl-mode-map help-char 'undefined)) (define-key hexl-mode-map "\C-i" 'hexl-self-insert-command) (define-key hexl-mode-map "\C-j" 'hexl-self-insert-command)