diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /lisp/kmacro.el | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.bz2 emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
Diffstat (limited to 'lisp/kmacro.el')
| -rw-r--r-- | lisp/kmacro.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/kmacro.el b/lisp/kmacro.el index 19e8735de48..bfc0edba2c1 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -1,6 +1,7 @@ ;;; kmacro.el --- enhanced keyboard macros -;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006, +;; 2007 Free Software Foundation, Inc. ;; Author: Kim F. Storm <storm@cua.dk> ;; Keywords: keyboard convenience @@ -255,7 +256,7 @@ macro to be executed before appending to it." (defun kmacro-insert-counter (arg) "Insert macro counter and increment with ARG or 1 if missing. -With \\[universal-argument], insert previous kmacro-counter (but do not modify counter)." +With \\[universal-argument], insert previous `kmacro-counter' (but do not modify counter)." (interactive "P") (if kmacro-initial-counter-value (setq kmacro-counter kmacro-initial-counter-value @@ -283,7 +284,7 @@ With \\[universal-argument], insert previous kmacro-counter (but do not modify c (defun kmacro-set-counter (arg) - "Set kmacro-counter to ARG or prompt if missing. + "Set `kmacro-counter' to ARG or prompt if missing. With \\[universal-argument] prefix, reset counter to its value prior to this iteration of the macro." (interactive "NMacro counter value: ") (if (not (or defining-kbd-macro executing-kbd-macro)) @@ -453,14 +454,14 @@ Optional arg EMPTY is message to print if no macros are defined." (defun kmacro-call-ring-2nd (arg) - "Execute second keyboard macro at in macro ring." + "Execute second keyboard macro in macro ring." (interactive "P") (unless (kmacro-ring-empty-p) (kmacro-exec-ring-item (car kmacro-ring) arg))) (defun kmacro-call-ring-2nd-repeat (arg) - "Execute second keyboard macro at in macro ring. + "Execute second keyboard macro in macro ring. This is like `kmacro-call-ring-2nd', but allows repeating macro commands without repeating the prefix." (interactive "P") @@ -670,7 +671,7 @@ the current value of `kmacro-counter'). When defining/executing macro, inserts macro counter and increments the counter with ARG or 1 if missing. With \\[universal-argument], -inserts previous kmacro-counter (but do not modify counter). +inserts previous `kmacro-counter' (but do not modify counter). The macro counter can be modified via \\[kmacro-set-counter] and \\[kmacro-add-counter]. The format of the counter can be modified via \\[kmacro-set-format]." @@ -941,7 +942,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (defvar kmacro-step-edit-prefix-commands '(universal-argument universal-argument-more universal-argument-minus digit-argument negative-argument) - "Commands which builds up a prefix arg for the current command") + "Commands which build up a prefix arg for the current command.") (defun kmacro-step-edit-prompt (macro index) ;; Show step-edit prompt |