aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPo Lu2024-02-08 10:01:57 +0800
committerPo Lu2024-02-08 10:08:07 +0800
commit1f9781ee7816ad3ec786ca7e10b4e82d1ad989c5 (patch)
tree69e833fc318b54191b0721da7357b749e3329bf6 /src
parente34ebc0ccc6c27e7e1217baad9ca74dd7bea4c37 (diff)
downloademacs-1f9781ee7816ad3ec786ca7e10b4e82d1ad989c5.tar.gz
emacs-1f9781ee7816ad3ec786ca7e10b4e82d1ad989c5.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c10
1 files changed, 7 insertions, 3 deletions
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)
592 592
593 if (echo_keystrokes_help) 593 if (echo_keystrokes_help)
594 { 594 {
595 AUTO_STRING (help, " (\\`C-h' for help)"); 595 Lisp_Object help;
596
597 help = build_string (" (\\`C-h' for help)");
596 kset_echo_string (current_kboard, 598 kset_echo_string (current_kboard,
597 concat2 (KVAR (current_kboard, echo_string), 599 concat2 (KVAR (current_kboard, echo_string),
598 calln (Qsubstitute_command_keys, help))); 600 calln (Qsubstitute_command_keys, help)));
@@ -13232,13 +13234,15 @@ Emacs also does a garbage collection if that seems to be warranted. */);
13232 XSETFASTINT (Vauto_save_timeout, 30); 13234 XSETFASTINT (Vauto_save_timeout, 30);
13233 13235
13234 DEFVAR_LISP ("echo-keystrokes", Vecho_keystrokes, 13236 DEFVAR_LISP ("echo-keystrokes", Vecho_keystrokes,
13235 doc: /* Nonzero means echo unfinished commands after this many seconds of pause. 13237 doc: /* Nonzero means echo unfinished commands after this many seconds of pause.
13236The value may be integer or floating point. 13238The value may be integer or floating point.
13237If the value is zero, don't echo at all. */); 13239If the value is zero, don't echo at all. */);
13238 Vecho_keystrokes = make_fixnum (1); 13240 Vecho_keystrokes = make_fixnum (1);
13239 13241
13240 DEFVAR_BOOL ("echo-keystrokes-help", echo_keystrokes_help, 13242 DEFVAR_BOOL ("echo-keystrokes-help", echo_keystrokes_help,
13241 doc: /* Non-nil means append small help text to the unfinished commands' echo. */); 13243 doc: /* Whether to append help text to echoed commands.
13244When non-nil, a reference to `C-h' is printed after echoed
13245keystrokes. */);
13242 echo_keystrokes_help = true; 13246 echo_keystrokes_help = true;
13243 13247
13244 DEFVAR_LISP ("polling-period", Vpolling_period, 13248 DEFVAR_LISP ("polling-period", Vpolling_period,