aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2017-07-22 11:24:05 +0300
committerEli Zaretskii2017-07-22 11:24:05 +0300
commit45c2544c347bbc239d04c9a276ee1988ebbc1a7c (patch)
treec2a12aa30c8bc98c9c366d400a5c07cb9f047dd7
parentd37a82b4a35bdffa0462ba9954bd432cf7d54659 (diff)
downloademacs-45c2544c347bbc239d04c9a276ee1988ebbc1a7c.tar.gz
emacs-45c2544c347bbc239d04c9a276ee1988ebbc1a7c.zip
Doc fixes for kmacro.el functions
* lisp/kmacro.el (kmacro-start-macro, kmacro-call-macro) (kmacro-end-and-call-macro): Don't use "permanent name", as that could be misinterpreted. (Bug#27492)
-rw-r--r--lisp/kmacro.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 838a492b6cb..472972e3edb 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -565,7 +565,8 @@ Use \\[kmacro-insert-counter] to insert (and increment) the macro counter.
565The counter value can be set or modified via \\[kmacro-set-counter] and \\[kmacro-add-counter]. 565The counter value can be set or modified via \\[kmacro-set-counter] and \\[kmacro-add-counter].
566The format of the counter can be modified via \\[kmacro-set-format]. 566The format of the counter can be modified via \\[kmacro-set-format].
567 567
568Use \\[kmacro-name-last-macro] to give it a permanent name. 568Use \\[kmacro-name-last-macro] to give it a name that will remain valid even
569after another macro is defined.
569Use \\[kmacro-bind-to-key] to bind it to a key sequence." 570Use \\[kmacro-bind-to-key] to bind it to a key sequence."
570 (interactive "P") 571 (interactive "P")
571 (if (or defining-kbd-macro executing-kbd-macro) 572 (if (or defining-kbd-macro executing-kbd-macro)
@@ -628,8 +629,8 @@ just the last key in the key sequence that you used to call this
628command. See `kmacro-call-repeat-key' and `kmacro-call-repeat-with-arg' 629command. See `kmacro-call-repeat-key' and `kmacro-call-repeat-with-arg'
629for details on how to adjust or disable this behavior. 630for details on how to adjust or disable this behavior.
630 631
631To make a macro permanent so you can call it even after defining 632To give a macro a name so you can call it even after defining others,
632others, use \\[kmacro-name-last-macro]." 633use \\[kmacro-name-last-macro]."
633 (interactive "p") 634 (interactive "p")
634 (let ((repeat-key (and (or (and (null no-repeat) 635 (let ((repeat-key (and (or (and (null no-repeat)
635 (> (length (this-single-command-keys)) 1)) 636 (> (length (this-single-command-keys)) 1))
@@ -730,8 +731,8 @@ With \\[universal-argument], call second macro in macro ring."
730With numeric prefix ARG, repeat macro that many times. 731With numeric prefix ARG, repeat macro that many times.
731Zero argument means repeat until there is an error. 732Zero argument means repeat until there is an error.
732 733
733To give a macro a permanent name, so you can call it 734To give a macro a name, so you can call it even after defining other
734even after defining other macros, use \\[kmacro-name-last-macro]." 735macros, use \\[kmacro-name-last-macro]."
735 (interactive "P") 736 (interactive "P")
736 (if defining-kbd-macro 737 (if defining-kbd-macro
737 (kmacro-end-macro nil)) 738 (kmacro-end-macro nil))