From: Po Lu <luangruo@yahoo.com>
Date: Thu, 8 Feb 2024 02:01:57 +0000 (+0800)
Subject: Fix earlier change to keyboard.c
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=008be23cf0f1aa6d210a630030b425c4f843bf5a;p=emacs.git

Fix earlier change to keyboard.c

* src/keyboard.c (echo_dash): Do not pass automatic string to
Lisp!
(syms_of_keyboard) <echo_keystrokes_help>: Improve doc string.

(cherry picked from commit 1f9781ee7816ad3ec786ca7e10b4e82d1ad989c5)
---

diff --git a/src/keyboard.c b/src/keyboard.c
index 6d3db5ab615..cd6ccbd77d0 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -592,7 +592,9 @@ echo_dash (void)
 
   if (echo_keystrokes_help)
     {
-      AUTO_STRING (help, " (\\`C-h' for help)");
+      Lisp_Object help;
+
+      help = build_string (" (\\`C-h' for help)");
       kset_echo_string (current_kboard,
 			concat2 (KVAR (current_kboard, echo_string),
 				 calln (Qsubstitute_command_keys, help)));
@@ -13232,13 +13234,15 @@ Emacs also does a garbage collection if that seems to be warranted.  */);
   XSETFASTINT (Vauto_save_timeout, 30);
 
   DEFVAR_LISP ("echo-keystrokes", Vecho_keystrokes,
-	       doc: /* Nonzero means echo unfinished commands after this many seconds of pause.
+    doc: /* Nonzero means echo unfinished commands after this many seconds of pause.
 The value may be integer or floating point.
 If the value is zero, don't echo at all.  */);
   Vecho_keystrokes = make_fixnum (1);
 
   DEFVAR_BOOL ("echo-keystrokes-help", echo_keystrokes_help,
-	       doc: /* Non-nil means append small help text to the unfinished commands' echo. */);
+    doc: /* Whether to append help text to echoed commands.
+When non-nil, a reference to `C-h' is printed after echoed
+keystrokes.  */);
   echo_keystrokes_help = true;
 
   DEFVAR_LISP ("polling-period", Vpolling_period,