diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-05-25 13:57:59 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-05-25 13:57:59 -0400 |
| commit | 97bb31be9f4e06060f2d192b049c3cdb47aca2f5 (patch) | |
| tree | 1c7e537561f05e65f43689dc9603056f96962402 /lisp/kmacro.el | |
| parent | 9661c82920cf2b75300266bbd9da9e45b9471173 (diff) | |
| parent | 86b49d58652a8f59a3489bf15b367ec224e17ae7 (diff) | |
| download | emacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.tar.gz emacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.tar.bz2 emacs-97bb31be9f4e06060f2d192b049c3cdb47aca2f5.zip | |
Merge from origin/emacs-28
86b49d5865 ; * etc/NEWS: Announce changes in 'desktop-kill'. (Bug#55...
d5ccf2621a ; Fix last change
f1c1fd7184 Improve documentation of mail-user-agent.
b05d1e9b98 ; * lisp/desktop.el: Update the commentary. (Bug#55560)
139bfa1a08 More fixes in abbrev.el doc strings
d80dea6036 Add note about Tramp completion to completion-styles doc s...
9e7c0cf57d Remove mention of removed nnimap-nov-is-evil variable
90aae0bca2 Improve documentation strings and prompts in abbrev.el
dfa3e6f424 Restore the Fselect_window call in gui_consider_frame_title.
de35e9728f Advise against settings in the MS-Windows system registry
3ffa3d3403 ; Minor addition to make-tarball.txt
7dc026f9ea Fix kmacro-keymap binding after previous change
4f0fd54bc4 Add glossary entries for "interactively"
af1c05a3c4 Fix the name of a kmacro command.
# Conflicts:
# etc/NEWS
# lisp/abbrev.el
Diffstat (limited to 'lisp/kmacro.el')
| -rw-r--r-- | lisp/kmacro.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 3f1f12fad6f..5746b770a2e 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -172,7 +172,7 @@ macro to be executed before appending to it." (define-key map "\C-k" #'kmacro-end-or-call-macro-repeat) (define-key map "r" #'apply-macro-to-region-lines) (define-key map "q" #'kbd-macro-query) ;; Like C-x q - (define-key map "d" #'kdb-macro-redisplay) + (define-key map "d" #'kmacro-redisplay) ;; macro ring (define-key map "\C-n" #'kmacro-cycle-ring-next) @@ -1374,12 +1374,12 @@ To customize possible responses, change the \"bindings\" in (kmacro-push-ring) (setq last-kbd-macro kmacro-step-edit-new-macro)))) -(defun kdb-macro-redisplay () - "Force redisplay during kbd macro execution." +(defun kmacro-redisplay () + "Force redisplay during keyboard macro execution." (interactive) (or executing-kbd-macro defining-kbd-macro - (user-error "Not defining or executing kbd macro")) + (user-error "Not defining or executing keyboard macro")) (when executing-kbd-macro (let ((executing-kbd-macro nil)) (redisplay)))) |