Commit 8892e83c authored by Eric S. Raymond's avatar Eric S. Raymond
Browse files

*** empty log message ***

parent c3aef019
...@@ -156,7 +156,7 @@ electric-buffer-menu-mode-hook if it is non-nil." ...@@ -156,7 +156,7 @@ electric-buffer-menu-mode-hook if it is non-nil."
(fillarray (lookup-key map "\e") 'Electric-buffer-menu-undefined) (fillarray (lookup-key map "\e") 'Electric-buffer-menu-undefined)
(define-key map "\C-z" 'suspend-emacs) (define-key map "\C-z" 'suspend-emacs)
(define-key map "v" 'Electric-buffer-menu-mode-view-buffer) (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 "?" 'Helper-describe-bindings)
(define-key map "\C-c" nil) (define-key map "\C-c" nil)
(define-key map "\C-c\C-c" 'Electric-buffer-menu-quit) (define-key map "\C-c\C-c" 'Electric-buffer-menu-quit)
......
...@@ -63,7 +63,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing." ...@@ -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-c\C-c" 'Electric-history-quit)
(define-key electric-history-map "\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-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 "?" 'Helper-describe-bindings)
(define-key electric-history-map "\e>" 'end-of-buffer) (define-key electric-history-map "\e>" 'end-of-buffer)
(define-key electric-history-map "\e<" 'beginning-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." ...@@ -131,7 +131,7 @@ The Command History listing is recomputed each time this mode is invoked."
(defun Electric-history-undefined () (defun Electric-history-undefined ()
(interactive) (interactive)
(ding) (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)) (sit-for 4))
(defun Electric-history-quit () (defun Electric-history-quit ()
......
...@@ -26,13 +26,10 @@ ...@@ -26,13 +26,10 @@
(defvar help-map (make-sparse-keymap) (defvar help-map (make-sparse-keymap)
"Keymap for characters following the Help key.") "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) (define-key global-map help-key 'help-command)
(fset 'help-command help-map) (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 "?" 'help-for-help)
(define-key help-map "\C-c" 'describe-copying) (define-key help-map "\C-c" 'describe-copying)
...@@ -230,17 +227,17 @@ C-d print Emacs ordering information. ...@@ -230,17 +227,17 @@ C-d print Emacs ordering information.
C-n print news of recent Emacs changes. C-n print news of recent Emacs changes.
C-w print information on absence of warranty for GNU Emacs." C-w print information on absence of warranty for GNU Emacs."
(interactive) (interactive)
(message (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: ") "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))) (let ((char (read-char)))
(if (or (= char ?\C-h) (= char ??)) (if (or (= char help-char) (= char ??))
(save-window-excursion (save-window-excursion
(switch-to-buffer "*Help*") (switch-to-buffer "*Help*")
(delete-other-windows) (delete-other-windows)
(erase-buffer) (erase-buffer)
(insert (documentation 'help-for-help)) (insert (documentation 'help-for-help))
(goto-char (point-min)) (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 ?\ )) (if (memq char '(?\C-v ?\ ))
(scroll-up)) (scroll-up))
(if (memq char '(?\177 ?\M-v)) (if (memq char '(?\177 ?\M-v))
......
...@@ -67,9 +67,6 @@ and \"-de\" when dehexlfying a buffer.") ...@@ -67,9 +67,6 @@ and \"-de\" when dehexlfying a buffer.")
(defvar hexl-max-address 0 (defvar hexl-max-address 0
"Maximum offset into hexl buffer.") "Maximum offset into hexl buffer.")
(defvar help-key "\C-h"
"*Key used to invoke electric help.")
(defvar hexl-mode-map nil) (defvar hexl-mode-map nil)
;; routines ;; routines
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment