mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Mention 'C-h' in echo for unfinished commands

Browse source 
* etc/NEWS: Mention it here.

* lisp/cus-start.el (standard): Add type and version for it.

* src/keyboard.c (echo-keystrokes-help): New user option
(https://lists.gnu.org/archive/html/emacs-devel/2024-02/msg00174.html).

* src/keyboard.c (echo_dash): Use it.
This commit is contained in:
Dmitry Gutov 2024-02-07 21:50:37 +02:00
parent 2ecaa60f05
commit f444786e58
3 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
etc/NEWS
View file

@ -307,6 +307,9 @@ between the auto save file and the current file.
** 'ffap-lax-url' now defaults to nil. ** 'ffap-lax-url' now defaults to nil.
Previously, it was set to t but this broke remote file name detection. Previously, it was set to t but this broke remote file name detection.
** Unfinished commands' echo now ends with a suggestion to use Help.
Customize 'echo-keystrokes-help' to nil to prevent that.
* Editing Changes in Emacs 30.1 * Editing Changes in Emacs 30.1

1
lisp/cus-start.el
View file

@ -371,6 +371,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(auto-save-timeout auto-save (choice (const :tag "off" nil) (auto-save-timeout auto-save (choice (const :tag "off" nil)
(integer :format "%v"))) (integer :format "%v")))
(echo-keystrokes minibuffer number) (echo-keystrokes minibuffer number)
(echo-keystrokes-help minibuffer boolean "30.1")
(polling-period keyboard float) (polling-period keyboard float)
(double-click-time mouse (restricted-sexp (double-click-time mouse (restricted-sexp
:match-alternatives (integerp 'nil 't))) :match-alternatives (integerp 'nil 't)))

13
src/keyboard.c
View file

@ -589,6 +589,15 @@ echo_dash (void)
AUTO_STRING (dash, "-"); AUTO_STRING (dash, "-");
kset_echo_string (current_kboard, kset_echo_string (current_kboard,
concat2 (KVAR (current_kboard, echo_string), dash)); concat2 (KVAR (current_kboard, echo_string), dash));
if (echo_keystrokes_help)
{
AUTO_STRING (help, " (\\`C-h' for help)");
kset_echo_string (current_kboard,
concat2 (KVAR (current_kboard, echo_string),
calln (Qsubstitute_command_keys, help)));
}
echo_now (); echo_now ();
} }
@ -13228,6 +13237,10 @@ The value may be integer or floating point.
If the value is zero, don't echo at all. */); If the value is zero, don't echo at all. */);
Vecho_keystrokes = make_fixnum (1); 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. */);
echo_keystrokes_help = true;
DEFVAR_LISP ("polling-period", Vpolling_period, DEFVAR_LISP ("polling-period", Vpolling_period,
doc: /* Interval between polling for input during Lisp execution. doc: /* Interval between polling for input during Lisp execution.
The reason for polling is to make C-g work to stop a running program. The reason for polling is to make C-g work to stop a running program.