mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 06:20:55 -08:00
Use 'help-key' function in more places
* lisp/dired-aux.el (dired-query): * lisp/emacs-lisp/helper.el (Helper-help-map): * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Use 'help-key'. * lisp/net/tramp-cmds.el (tramp-rename-files): * lisp/which-key.el (which-key--next-page-hint): Prefer 'help-key' when available. * lisp/help.el (help-key): Simplify. * etc/symbol-releases.eld: Add 'help-key'.
This commit is contained in:
parent
49e019fbbc
commit
69210eb84e
7 changed files with 11 additions and 8 deletions
|
|
@ -47,7 +47,7 @@
|
|||
;;"f" #'Helper-describe-function
|
||||
;;"v" #'Helper-describe-variable
|
||||
"?" #'Helper-help-options
|
||||
(key-description (char-to-string help-char)) #'Helper-help-options)
|
||||
(help-key) #'Helper-help-options)
|
||||
(fset 'Helper-help-map Helper-help-map)
|
||||
|
||||
(defun Helper-help-scroller ()
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ The function's value is the number of actions taken."
|
|||
"%s(\\`y', \\`n', \\`!', \\`.', \\`q', %sor \\`%s') "
|
||||
minibuffer-prompt-properties)
|
||||
prompt user-keys
|
||||
(key-description (vector help-char)))))
|
||||
(help-key))))
|
||||
(if minibuffer-auto-raise
|
||||
(raise-frame (window-frame (minibuffer-window))))
|
||||
(unwind-protect
|
||||
|
|
@ -198,7 +198,7 @@ The function's value is the number of actions taken."
|
|||
(format
|
||||
"%s(\\`y', \\`n', \\`!', \\`.', \\`q', %sor \\`%s') %s"
|
||||
prompt user-keys
|
||||
(key-description (vector help-char))
|
||||
(help-key)
|
||||
(if (equal char -1)
|
||||
"[end-of-keyboard-macro]"
|
||||
(single-key-description char))))))
|
||||
|
|
@ -279,7 +279,7 @@ Type \\`SPC' or \\`y' to %s the current %s;
|
|||
(message (substitute-command-keys
|
||||
(format
|
||||
"Type \\`%s' for help"
|
||||
(key-description (vector help-char)))))
|
||||
(help-key))))
|
||||
(beep)
|
||||
(sit-for 1)
|
||||
(funcall try-again))))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue