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

[Kim F. Storm]

Index: emacs/lisp/kmacro.el
diff -c emacs/lisp/kmacro.el:1.13 emacs/lisp/kmacro.el:1.14
*** emacs/lisp/kmacro.el:1.13   Fri Sep 13 03:18:27 2002
--- emacs/lisp/kmacro.el        Fri Sep 20 16:38:18 2002
***************
*** 769,774 ****
--- 769,775 ----
  (define-key kmacro-step-edit-map "f" 'skip-keep)
  (define-key kmacro-step-edit-map "q" 'quit)
  (define-key kmacro-step-edit-map "d" 'skip)
+ (define-key kmacro-step-edit-map "\C-d" 'skip)
  (define-key kmacro-step-edit-map "i" 'insert)
  (define-key kmacro-step-edit-map "I" 'insert-1)
  (define-key kmacro-step-edit-map "r" 'replace)
***************
*** 917,923 ****
         ((eq act 'skip-rest)
        (setq kmacro-step-edit-active 'ignore)
        nil)
!        ((eq act 'automatic)
        (setq kmacro-step-edit-active nil)
        (setq act t)
        t)
--- 918,924 ----
         ((eq act 'skip-rest)
        (setq kmacro-step-edit-active 'ignore)
        nil)
!        ((memq act '(automatic exit))
        (setq kmacro-step-edit-active nil)
        (setq act t)
        t)
***************
*** 1092,1099 ****
      (add-hook 'post-command-hook 'kmacro-step-edit-post-command t)
      (add-hook 'minibuffer-setup-hook 'kmacro-step-edit-minibuf-setup t)
      (call-last-kbd-macro nil nil)
!     (if kmacro-step-edit-replace
!       (setq last-kbd-macro kmacro-step-edit-new-macro))))
  
  (provide 'kmacro)
  ;;; kmacro.el ends here
--- 1093,1103 ----
      (add-hook 'post-command-hook 'kmacro-step-edit-post-command t)
      (add-hook 'minibuffer-setup-hook 'kmacro-step-edit-minibuf-setup t)
      (call-last-kbd-macro nil nil)
!     (when (and kmacro-step-edit-replace
!              kmacro-step-edit-new-macro
!              (not (equal last-kbd-macro kmacro-step-edit-new-macro)))
!       (kmacro-push-ring)
!       (setq last-kbd-macro kmacro-step-edit-new-macro))))
  
  (provide 'kmacro)
  ;;; kmacro.el ends here