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

[Juanma Barranquero]

Index: emacs/lisp/kmacro.el
diff -c emacs/lisp/kmacro.el:1.14 emacs/lisp/kmacro.el:1.15
*** emacs/lisp/kmacro.el:1.14   Fri Sep 20 16:38:18 2002
--- emacs/lisp/kmacro.el        Tue Feb  4 06:32:35 2003
***************
*** 94,100 ****
  ;; and you can set the macro counter format with C-x C-k C-f.
  
  ;; The following key bindings are performed:
! ;; 
  ;;           Normal                         While defining macro
  ;;           ---------------------------    ------------------------------
  ;;  f3       Define macro                   Insert current counter value
--- 94,100 ----
  ;; and you can set the macro counter format with C-x C-k C-f.
  
  ;; The following key bindings are performed:
! ;;
  ;;           Normal                         While defining macro
  ;;           ---------------------------    ------------------------------
  ;;  f3       Define macro                   Insert current counter value
***************
*** 102,114 ****
  ;;           counter value (default 0)      (default increment: 1)
  ;;
  ;;  C-u f3   APPENDs to last macro
! ;; 
! ;;  f4       Call last macro                End macro 
  ;;           Prefix arg specifies number
  ;;           of times to execute macro.
  ;;
  ;;  C-u f4   Swap last and head of macro ring.
! ;; 
  ;;  S-mouse-3  Set point at click and       End macro and execute macro at
  ;;             execute last macro.          click.
  
--- 102,114 ----
  ;;           counter value (default 0)      (default increment: 1)
  ;;
  ;;  C-u f3   APPENDs to last macro
! ;;
! ;;  f4       Call last macro                End macro
  ;;           Prefix arg specifies number
  ;;           of times to execute macro.
  ;;
  ;;  C-u f4   Swap last and head of macro ring.
! ;;
  ;;  S-mouse-3  Set point at click and       End macro and execute macro at
  ;;             execute last macro.          click.
  
***************
*** 339,345 ****
  Non-nil arg RAW means just return raw first element."
    (unless (kmacro-ring-empty-p)
      (kmacro-pop-ring1 raw)))
!       
  
  (defun kmacro-ring-length ()
    "Return length of macro ring, including pseudo head."
--- 339,345 ----
  Non-nil arg RAW means just return raw first element."
    (unless (kmacro-ring-empty-p)
      (kmacro-pop-ring1 raw)))
! 
  
  (defun kmacro-ring-length ()
    "Return length of macro ring, including pseudo head."
***************
*** 368,374 ****
             (m (format-kbd-macro macro))
             (l (length m))
             (z (and nil trunc (> l x))))
!       (message (format "%s: %s%s" (or descr "Macro") 
                         (if z (substring m 0 (1- x)) m) (if z "..." ""))))
      (message (or empty "No keyboard macros defined"))))
  
--- 368,374 ----
             (m (format-kbd-macro macro))
             (l (length m))
             (z (and nil trunc (> l x))))
!       (message (format "%s: %s%s" (or descr "Macro")
                         (if z (substring m 0 (1- x)) m) (if z "..." ""))))
      (message (or empty "No keyboard macros defined"))))
  
***************
*** 439,445 ****
      (kmacro-display (car (car kmacro-ring)) "2nd macro")))
  
  
!   
  (defun kmacro-cycle-ring-next (&optional arg)
    "Move to next keyboard macro in keyboard macro ring.
  Displays the selected macro in the echo area."
--- 439,445 ----
      (kmacro-display (car (car kmacro-ring)) "2nd macro")))
  
  
! 
  (defun kmacro-cycle-ring-next (&optional arg)
    "Move to next keyboard macro in keyboard macro ring.
  Displays the selected macro in the echo area."
***************
*** 500,506 ****
  
  ;;; Traditional bindings:
  
!   
  ;;;###autoload
  (defun kmacro-start-macro (arg)
    "Record subsequent keyboard input, defining a keyboard macro.
--- 500,506 ----
  
  ;;; Traditional bindings:
  
! 
  ;;;###autoload
  (defun kmacro-start-macro (arg)
    "Record subsequent keyboard input, defining a keyboard macro.
***************
*** 527,533 ****
        (unless append
        (if last-kbd-macro
            (let ((len (length kmacro-ring)))
!             (setq kmacro-ring 
                    (cons
                     (list last-kbd-macro kmacro-counter 
kmacro-counter-format-start)
                     kmacro-ring))
--- 527,533 ----
        (unless append
        (if last-kbd-macro
            (let ((len (length kmacro-ring)))
!             (setq kmacro-ring
                    (cons
                     (list last-kbd-macro kmacro-counter 
kmacro-counter-format-start)
                     kmacro-ring))
***************
*** 538,544 ****
              kmacro-last-counter kmacro-counter
              kmacro-counter-format-start kmacro-counter-format))
  
!       (start-kbd-macro append 
                       (and append
                            (if kmacro-execute-before-append
                                (> (car arg) 4)
--- 538,544 ----
              kmacro-last-counter kmacro-counter
              kmacro-counter-format-start kmacro-counter-format))
  
!       (start-kbd-macro append
                       (and append
                            (if kmacro-execute-before-append
                                (> (car arg) 4)
***************
*** 592,598 ****
                       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))
--- 592,598 ----
                       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))
***************
*** 640,646 ****
  With numeric prefix ARG, repeat macro that many times.
  With \\[universal-argument], call second macro in macro ring."
    (interactive "P")
!   (cond 
     (defining-kbd-macro
       (if kmacro-call-repeat-key
         (kmacro-call-macro arg no-repeat t)
--- 640,646 ----
  With numeric prefix ARG, repeat macro that many times.
  With \\[universal-argument], call second macro in macro ring."
    (interactive "P")
!   (cond
     (defining-kbd-macro
       (if kmacro-call-repeat-key
         (kmacro-call-macro arg no-repeat t)
***************
*** 796,802 ****
              (format "Macro: %s%s%s%s%s\n"
                      (format-kbd-macro kmacro-step-edit-new-macro 1)
                      (if (and kmacro-step-edit-new-macro (> (length 
kmacro-step-edit-new-macro) 0)) " " "")
!                     (propertize (if keys (format-kbd-macro keys) 
                                    (if kmacro-step-edit-appending "<APPEND>" 
"<INSERT>")) 'face 'region)
                      (if future " " "")
                      (if future (format-kbd-macro future) ""))
--- 796,802 ----
              (format "Macro: %s%s%s%s%s\n"
                      (format-kbd-macro kmacro-step-edit-new-macro 1)
                      (if (and kmacro-step-edit-new-macro (> (length 
kmacro-step-edit-new-macro) 0)) " " "")
!                     (propertize (if keys (format-kbd-macro keys)
                                    (if kmacro-step-edit-appending "<APPEND>" 
"<INSERT>")) 'face 'region)
                      (if future " " "")
                      (if future (format-kbd-macro future) ""))
***************
*** 813,819 ****
                        curmsg))
               (t ""))
              (if keys
!                 (format "%s\n%s%s %S [yn iIaArR C-k kq!] " 
                          (propertize "\
  --------------Step Edit Keyboard Macro  [?: help]---------------" 'face 
'mode-line)
                          (if kmacro-step-edit-help "\
--- 813,819 ----
                        curmsg))
               (t ""))
              (if keys
!                 (format "%s\n%s%s %S [yn iIaArR C-k kq!] "
                          (propertize "\
  --------------Step Edit Keyboard Macro  [?: help]---------------" 'face 
'mode-line)
                          (if kmacro-step-edit-help "\
***************
*** 826,832 ****
  " "")
                          (propertize "Next command:" 'face 'bold)
                          this-command)
!               (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)"))
--- 826,832 ----
  " "")
                          (propertize "Next command:" 'face 'bold)
                          this-command)
!               (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)"))
***************
*** 864,870 ****
          (clear-this-command-keys) ;; recent-keys actually
          (let (unread-command-events)
            (quoted-insert (prefix-numeric-value current-prefix-arg))
!           (setq kmacro-step-edit-new-macro 
                  (vconcat kmacro-step-edit-new-macro (recent-keys)))
            (when unread-command-events
              (setq kmacro-step-edit-new-macro
--- 864,870 ----
          (clear-this-command-keys) ;; recent-keys actually
          (let (unread-command-events)
            (quoted-insert (prefix-numeric-value current-prefix-arg))
!           (setq kmacro-step-edit-new-macro
                  (vconcat kmacro-step-edit-new-macro (recent-keys)))
            (when unread-command-events
              (setq kmacro-step-edit-new-macro
***************
*** 957,963 ****
        (if (> executing-macro-index (or kmacro-step-edit-prefix-index 
kmacro-step-edit-key-index))
          (setq kmacro-step-edit-new-macro
                (vconcat kmacro-step-edit-new-macro
!                        (substring executing-kbd-macro 
                                    (or kmacro-step-edit-prefix-index 
kmacro-step-edit-key-index)
                                    (if (eq act t) nil executing-macro-index)))
                kmacro-step-edit-prefix-index nil))
--- 957,963 ----
        (if (> executing-macro-index (or kmacro-step-edit-prefix-index 
kmacro-step-edit-key-index))
          (setq kmacro-step-edit-new-macro
                (vconcat kmacro-step-edit-new-macro
!                        (substring executing-kbd-macro
                                    (or kmacro-step-edit-prefix-index 
kmacro-step-edit-key-index)
                                    (if (eq act t) nil executing-macro-index)))
                kmacro-step-edit-prefix-index nil))
***************
*** 1068,1074 ****
      (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil)
      (if kmacro-step-edit-key-index
        (setq executing-macro-index kmacro-step-edit-key-index)
!       (setq kmacro-step-edit-key-index executing-macro-index))))  
  
  
  (defun kmacro-step-edit-macro ()
--- 1068,1074 ----
      (add-hook 'pre-command-hook 'kmacro-step-edit-pre-command nil nil)
      (if kmacro-step-edit-key-index
        (setq executing-macro-index kmacro-step-edit-key-index)
!       (setq kmacro-step-edit-key-index executing-macro-index))))
  
  
  (defun kmacro-step-edit-macro ()