mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-27 07:37:33 +00:00
Code Issues Releases Activity

Use executing-kbd-macro-index variable.

Browse Source
This commit is contained in:
Kim F. Storm 2005-05-02 10:33:33 +00:00
parent e40527dcb9
commit 1bf2f306bb
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lisp/kmacro.el
View File

@ -960,9 +960,9 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(defun kmacro-step-edit-prompt (macro index) (defun kmacro-step-edit-prompt (macro index)
;; Show step-edit prompt ;; Show step-edit prompt
(let ((keys (and (not kmacro-step-edit-appending) (let ((keys (and (not kmacro-step-edit-appending)
index (substring macro index executing-macro-index))) index (substring macro index executing-kbd-macro-index)))
(future (and (not kmacro-step-edit-appending) (future (and (not kmacro-step-edit-appending)
(substring macro executing-macro-index))) (substring macro executing-kbd-macro-index)))
(message-log-max nil) (message-log-max nil)
(curmsg (current-message))) (curmsg (current-message)))
@ -1020,12 +1020,12 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(not (eq kmacro-step-edit-action t))) (not (eq kmacro-step-edit-action t)))
;; Find the actual end of this key sequence. ;; Find the actual end of this key sequence.
;; Must be able to backtrack in case we actually execute it. ;; Must be able to backtrack in case we actually execute it.
(setq restore-index executing-macro-index) (setq restore-index executing-kbd-macro-index)
(let (unread-command-events) (let (unread-command-events)
(quoted-insert 0) (quoted-insert 0)
(when unread-command-events (when unread-command-events
(setq executing-macro-index (- executing-macro-index (length unread-command-events)) (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events))
next-index executing-macro-index))))) next-index executing-kbd-macro-index)))))
;; Query the user; stop macro exection temporarily ;; Query the user; stop macro exection temporarily
(let ((macro executing-kbd-macro) (let ((macro executing-kbd-macro)
@ -1045,7 +1045,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(when unread-command-events (when unread-command-events
(setq kmacro-step-edit-new-macro (setq kmacro-step-edit-new-macro
(substring kmacro-step-edit-new-macro 0 (- (length unread-command-events))) (substring kmacro-step-edit-new-macro 0 (- (length unread-command-events)))
executing-macro-index (- executing-macro-index (length unread-command-events))))) executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)))))
(setq current-prefix-arg nil (setq current-prefix-arg nil
prefix-arg nil) prefix-arg nil)
(setq act 'ignore)) (setq act 'ignore))
@ -1099,24 +1099,24 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(setq act t) (setq act t)
t) t)
((member act '(insert-1 insert)) ((member act '(insert-1 insert))
(setq executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
(setq kmacro-step-edit-inserting (if (eq act 'insert-1) 1 t)) (setq kmacro-step-edit-inserting (if (eq act 'insert-1) 1 t))
nil) nil)
((member act '(replace-1 replace)) ((member act '(replace-1 replace))
(setq kmacro-step-edit-inserting (if (eq act 'replace-1) 1 t)) (setq kmacro-step-edit-inserting (if (eq act 'replace-1) 1 t))
(setq kmacro-step-edit-prefix-index nil) (setq kmacro-step-edit-prefix-index nil)
(if (= executing-macro-index (length executing-kbd-macro)) (if (= executing-kbd-macro-index (length executing-kbd-macro))
(setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
kmacro-step-edit-appending t)) kmacro-step-edit-appending t))
nil) nil)
((eq act 'append) ((eq act 'append)
(setq kmacro-step-edit-inserting t) (setq kmacro-step-edit-inserting t)
(if (= executing-macro-index (length executing-kbd-macro)) (if (= executing-kbd-macro-index (length executing-kbd-macro))
(setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
kmacro-step-edit-appending t)) kmacro-step-edit-appending t))
t) t)
((eq act 'append-end) ((eq act 'append-end)
(if (= executing-macro-index (length executing-kbd-macro)) (if (= executing-kbd-macro-index (length executing-kbd-macro))
(setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
kmacro-step-edit-inserting t kmacro-step-edit-inserting t
kmacro-step-edit-appending t) kmacro-step-edit-appending t)
@ -1124,21 +1124,21 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(setq act t) (setq act t)
t) t)
((eq act 'help) ((eq act 'help)
(setq executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
(setq kmacro-step-edit-help (not kmacro-step-edit-help)) (setq kmacro-step-edit-help (not kmacro-step-edit-help))
nil) nil)
(t ;; Ignore unknown responses (t ;; Ignore unknown responses
(setq executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
nil)) nil))
(if (> executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)) (if (> executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index))
(setq kmacro-step-edit-new-macro (setq kmacro-step-edit-new-macro
(vconcat kmacro-step-edit-new-macro (vconcat kmacro-step-edit-new-macro
(substring executing-kbd-macro (substring executing-kbd-macro
(or kmacro-step-edit-prefix-index kmacro-step-edit-key-index) (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)
(if (eq act t) nil executing-macro-index))) (if (eq act t) nil executing-kbd-macro-index)))
kmacro-step-edit-prefix-index nil)) kmacro-step-edit-prefix-index nil))
(if restore-index (if restore-index
(setq executing-macro-index restore-index))) (setq executing-kbd-macro-index restore-index)))
(t (t
(setq this-command 'ignore))) (setq this-command 'ignore)))
(setq kmacro-step-edit-key-index next-index))) (setq kmacro-step-edit-key-index next-index)))
@ -1151,7 +1151,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(executing-kbd-macro nil) (executing-kbd-macro nil)
(defining-kbd-macro nil) (defining-kbd-macro nil)
cmd keys next-index) cmd keys next-index)
(setq executing-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index) (setq executing-kbd-macro-index (or kmacro-step-edit-prefix-index kmacro-step-edit-key-index)
kmacro-step-edit-prefix-index nil) kmacro-step-edit-prefix-index nil)
(kmacro-step-edit-prompt macro nil) (kmacro-step-edit-prompt macro nil)
;; Now, we have read a key sequence from the macro, but we don't want ;; Now, we have read a key sequence from the macro, but we don't want
@ -1172,8 +1172,8 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(setq kmacro-step-edit-inserting nil) (setq kmacro-step-edit-inserting nil)
(when unread-command-events (when unread-command-events
(setq keys (substring keys 0 (- (length unread-command-events))) (setq keys (substring keys 0 (- (length unread-command-events)))
executing-macro-index (- executing-macro-index (length unread-command-events)) executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events))
next-index executing-macro-index next-index executing-kbd-macro-index
unread-command-events nil))) unread-command-events nil)))
(setq cmd 'ignore) (setq cmd 'ignore)
nil) nil)
@ -1217,7 +1217,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
((eq kmacro-step-edit-active 'ignore) ((eq kmacro-step-edit-active 'ignore)
(setq this-command 'ignore)) (setq this-command 'ignore))
((eq kmacro-step-edit-active 'append-end) ((eq kmacro-step-edit-active 'append-end)
(if (= executing-macro-index (length executing-kbd-macro)) (if (= executing-kbd-macro-index (length executing-kbd-macro))
(setq executing-kbd-macro (vconcat executing-kbd-macro [nil]) (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
kmacro-step-edit-inserting t kmacro-step-edit-inserting t
kmacro-step-edit-appending t kmacro-step-edit-appending t
@ -1243,8 +1243,8 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
(when kmacro-step-edit-active (when kmacro-step-edit-active
(add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil) (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil)
(if kmacro-step-edit-key-index (if kmacro-step-edit-key-index
(setq executing-macro-index kmacro-step-edit-key-index) (setq executing-kbd-macro-index kmacro-step-edit-key-index)
(setq kmacro-step-edit-key-index executing-macro-index)))) (setq kmacro-step-edit-key-index executing-kbd-macro-index))))
(defun kmacro-step-edit-macro () (defun kmacro-step-edit-macro ()