summaryrefslogtreecommitdiff
path: root/lisp/macros.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/macros.el')
-rw-r--r--lisp/macros.el37
1 files changed, 19 insertions, 18 deletions
diff --git a/lisp/macros.el b/lisp/macros.el
index b318ff8eefb..bd2bd9ce449 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -20,9 +20,10 @@
(defun name-last-kbd-macro (symbol)
"Assign a name to the last keyboard macro defined.
-Argument SYMBOL is the name to define.
+One arg, a symbol, which is the name to define.
The symbol's function definition becomes the keyboard macro string.
-Such a \"function\" cannot be called from Lisp, but it is a valid editor command."
+Such a \"function\" cannot be called from Lisp, but it is a valid command
+definition for the editor command loop."
(interactive "SName for last kbd macro: ")
(or last-kbd-macro
(error "No keyboard macro defined"))
@@ -34,14 +35,14 @@ Such a \"function\" cannot be called from Lisp, but it is a valid editor command
(defun insert-kbd-macro (macroname &optional keys)
"Insert in buffer the definition of kbd macro NAME, as Lisp code.
-Optional second arg KEYS means also record the keys it is on
-(this is the prefix argument, when calling interactively).
+Second argument KEYS non-nil means also record the keys it is on.
+ (This is the prefix argument, when calling interactively.)
-This Lisp code will, when executed, define the kbd macro with the same
-definition it has now. If you say to record the keys, the Lisp code
-will also rebind those keys to the macro. Only global key bindings
-are recorded since executing this Lisp code always makes global
-bindings.
+This Lisp code will, when executed, define the kbd macro with the
+same definition it has now. If you say to record the keys,
+the Lisp code will also rebind those keys to the macro.
+Only global key bindings are recorded since executing this Lisp code
+always makes global bindings.
To save a kbd macro, visit a file of Lisp code such as your ~/.emacs,
use this command, and then save the file."
@@ -63,15 +64,15 @@ use this command, and then save the file."
(defun kbd-macro-query (flag)
"Query user during kbd macro execution.
- With prefix argument, enters recursive edit, reading keyboard
-commands even within a kbd macro. You can give different commands
-each time the macro executes.
- Without prefix argument, reads a character. Your options are:
-Space -- execute the rest of the macro.
-DEL -- skip the rest of the macro; start next repetition.
-C-d -- skip rest of the macro and don't repeat it any more.
-C-r -- enter a recursive edit, then on exit ask again for a character
-C-l -- redisplay screen and ask again."
+With prefix argument, enters recursive edit,
+ reading keyboard commands even within a kbd macro.
+ You can give different commands each time the macro executes.
+Without prefix argument, reads a character. Your options are:
+ Space -- execute the rest of the macro.
+ DEL -- skip the rest of the macro; start next repetition.
+ C-d -- skip rest of the macro and don't repeat it any more.
+ C-r -- enter a recursive edit, then on exit ask again for a character
+ C-l -- redisplay screen and ask again."
(interactive "P")
(or executing-macro
defining-kbd-macro