[Emacs-diffs] Changes to emacs/lisp/kmacro.el

[Kim F. Storm]

Index: emacs/lisp/kmacro.el
diff -c emacs/lisp/kmacro.el:1.9 emacs/lisp/kmacro.el:1.10
*** emacs/lisp/kmacro.el:1.9    Mon Sep  9 21:23:22 2002
--- emacs/lisp/kmacro.el        Tue Sep 10 18:08:45 2002
***************
*** 592,602 ****
                       kmacro-call-repeat-key)))
        (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil))
        (while repeat-key
!       (message "Repeat macro %swith `%s'..." 
                 (if (and kmacro-call-repeat-with-arg
                          arg (> arg 1))
!                    (format "%d times " arg) "")
!                repeat-key-str)
        (if (equal repeat-key (read-event))
            (progn
              (clear-this-command-keys t)
--- 592,602 ----
                       kmacro-call-repeat-key)))
        (setq repeat-key-str (format-kbd-macro (vector repeat-key) nil))
        (while repeat-key
!       (message "(Type %s to repeat macro%s)" 
!                repeat-key-str
                 (if (and kmacro-call-repeat-with-arg
                          arg (> arg 1))
!                    (format " %d times" arg) ""))
        (if (equal repeat-key (read-event))
            (progn
              (clear-this-command-keys t)
***************
*** 752,760 ****
  (defvar kmacro-step-edit-map (make-sparse-keymap)
    "Keymap that defines the responses to questions in `kmacro-step-edit-macro'.
  This keymap is an extension to the `query-replace-map', allowing the
! following additional answers: `insert-1', `insert', `append-1', 
! `append', `replace-1', `replace', `act-repeat', `skip-rest',
! `skip-keep'.")
  
  ;; query-replace-map answers include: `act', `skip', `act-and-show',
  ;; `exit', `act-and-exit', `edit', `delete-and-edit', `recenter',
--- 752,759 ----
  (defvar kmacro-step-edit-map (make-sparse-keymap)
    "Keymap that defines the responses to questions in `kmacro-step-edit-macro'.
  This keymap is an extension to the `query-replace-map', allowing the
! following additional answers: `insert', `insert-1', `replace', `replace-1',
! `append', `append-end', `act-repeat', `skip-end', `skip-keep'.")
  
  ;; query-replace-map answers include: `act', `skip', `act-and-show',
  ;; `exit', `act-and-exit', `edit', `delete-and-edit', `recenter',
***************
*** 775,781 ****
  (define-key kmacro-step-edit-map "r" 'replace)
  (define-key kmacro-step-edit-map "R" 'replace-1)
  (define-key kmacro-step-edit-map "a" 'append)
! (define-key kmacro-step-edit-map "A" 'append-1)
  
  (defvar kmacro-step-edit-prefix-commands
    '(universal-argument universal-argument-more universal-argument-minus
--- 774,780 ----
  (define-key kmacro-step-edit-map "r" 'replace)
  (define-key kmacro-step-edit-map "R" 'replace-1)
  (define-key kmacro-step-edit-map "a" 'append)
! (define-key kmacro-step-edit-map "A" 'append-end)
  
  (defvar kmacro-step-edit-prefix-commands
    '(universal-argument universal-argument-more universal-argument-minus
***************
*** 828,834 ****
                (propertize 
                 (format "Type key sequence%s to insert and execute%s: "
                         (if (numberp kmacro-step-edit-inserting) ""  "s")
!                        (if (numberp kmacro-step-edit-inserting) ""  "[end 
with C-j]"))
                 'face 'bold))))))
  
  (defun kmacro-step-edit-query ()
--- 827,833 ----
                (propertize 
                 (format "Type key sequence%s to insert and execute%s: "
                         (if (numberp kmacro-step-edit-inserting) ""  "s")
!                        (if (numberp kmacro-step-edit-inserting) ""  " (end 
with C-j)"))
                 'face 'bold))))))
  
  (defun kmacro-step-edit-query ()
***************
*** 932,943 ****
            (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
                  kmacro-step-edit-appending t))
        nil)
!        ((member act '(append-1 append))
!       (setq kmacro-step-edit-inserting (if (eq act 'append-1) 1 t))
        (if (= executing-macro-index (length executing-kbd-macro))
            (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
                  kmacro-step-edit-appending t))
        t)
         ((eq act 'help)
        (setq executing-macro-index (or kmacro-step-edit-prefix-index 
kmacro-step-edit-key-index))
        (setq kmacro-step-edit-help (not kmacro-step-edit-help))
--- 931,950 ----
            (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
                  kmacro-step-edit-appending t))
        nil)
!        ((eq act 'append)
!       (setq kmacro-step-edit-inserting t)
        (if (= executing-macro-index (length executing-kbd-macro))
            (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
                  kmacro-step-edit-appending t))
        t)
+        ((eq act 'append-end)
+       (if (= executing-macro-index (length executing-kbd-macro))
+           (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
+                 kmacro-step-edit-inserting t
+                 kmacro-step-edit-appending t)
+         (setq kmacro-step-edit-active 'append-end))
+       (setq act t)
+       t)
         ((eq act 'help)
        (setq executing-macro-index (or kmacro-step-edit-prefix-index 
kmacro-step-edit-key-index))
        (setq kmacro-step-edit-help (not kmacro-step-edit-help))
***************
*** 1031,1036 ****
--- 1038,1049 ----
      (cond
       ((eq kmacro-step-edit-active 'ignore)
        (setq this-command 'ignore))
+      ((eq kmacro-step-edit-active 'append-end)
+       (if (= executing-macro-index (length executing-kbd-macro))
+         (setq executing-kbd-macro (vconcat executing-kbd-macro [nil])
+               kmacro-step-edit-inserting t
+               kmacro-step-edit-appending t
+               kmacro-step-edit-active t)))
       ((/= kmacro-step-edit-num-input-keys num-input-keys)
        (if kmacro-step-edit-inserting
          (kmacro-step-edit-insert)