From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 17 Mar 2025 17:45:20 +0000 (+0100)
Subject: Use 'help-key' function in more places
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef8a13e46ed63240985353bc39c7af568cea05cc;p=emacs.git

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'.

(cherry picked from commit 69210eb84e7c3074c339b8aa2f380f66a80ae61b)
---

diff --git a/etc/symbol-releases.eld b/etc/symbol-releases.eld
index 93f0f5419f4..9732f60fc16 100644
--- a/etc/symbol-releases.eld
+++ b/etc/symbol-releases.eld
@@ -10,6 +10,7 @@
 
 (
  ("29.1" fun plistp)
+ ("29.1" fun help-key)
  ("28.1" fun always)
  ("27.1" fun project-files)
  ("26.1" fun flymake--diag-region)
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 952497032a2..fc9912f189e 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -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))))
diff --git a/lisp/help.el b/lisp/help.el
index 6cdf71cea39..13f0bda0fb8 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -52,7 +52,7 @@ buffer.")
 
 (defun help-key ()
   "Return `help-char' in a format suitable for the `keymap-set' KEY argument."
-  (key-description (char-to-string help-char)))
+  (key-description (vector help-char)))
 
 (declare-function cl-describe-type "cl-extra")
 
diff --git a/lisp/net/tramp-cmds.el b/lisp/net/tramp-cmds.el
index 9161d233b28..e59a614d935 100644
--- a/lisp/net/tramp-cmds.el
+++ b/lisp/net/tramp-cmds.el
@@ -548,7 +548,8 @@ ESC or `q' to quit without changing further buffers,
 		 (new-bfn (and (stringp bfn) (string-replace source target bfn)))
 		 (prompt (format-message
 			  "Set visited file name to `%s' [Type yn!eq or %s] "
-			  new-bfn (key-description (vector help-char)))))
+                          new-bfn (if (fboundp 'help-key) (help-key) ; 29.1
+                                    (key-description (vector help-char))))))
 	    (when (and (buffer-live-p buffer) (stringp bfn)
 		       (string-prefix-p source bfn)
 		       ;; Skip, and don't ask again.
diff --git a/lisp/which-key.el b/lisp/which-key.el
index dfc895c2576..830c915e01c 100644
--- a/lisp/which-key.el
+++ b/lisp/which-key.el
@@ -2213,7 +2213,8 @@ Actual lines: %s"
   (let* ((paging-key (concat prefix-keys " " which-key-paging-key))
          (paging-key-bound (eq 'which-key-C-h-dispatch
                                (key-binding (kbd paging-key))))
-         (key (key-description (vector help-char)))
+         (key (if (fboundp 'help-key) (help-key) ; 29.1
+                (key-description (vector help-char))))
          (key (if paging-key-bound
                   (concat key " or " which-key-paging-key)
                 key)))