Show
Ignore:
Timestamp:
05/13/06 11:31:18 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/kmacro.el

    r4037 r4079  
    350350  "Push ELT or current macro onto `kmacro-ring'." 
    351351  (when (setq elt (or elt (kmacro-ring-head))) 
    352     (let ((len (length kmacro-ring))) 
    353       (setq kmacro-ring (cons elt kmacro-ring)) 
    354       (if (>= len kmacro-ring-max) 
    355           (setcdr (nthcdr len kmacro-ring) nil))))) 
     352    (let ((history-delete-duplicates nil)) 
     353      (add-to-history 'kmacro-ring elt kmacro-ring-max)))) 
    356354 
    357355 
    …… 
    376374  (unless (kmacro-ring-empty-p) 
    377375    (kmacro-pop-ring1 raw))) 
    378  
    379  
    380 (defun kmacro-ring-length () 
    381   "Return length of macro ring, including pseudo head." 
    382   (+ (if last-kbd-macro 1 0) (length kmacro-ring))) 
    383376 
    384377 
    …… 
    578571      (unless append 
    579572        (if last-kbd-macro 
    580             (let ((len (length kmacro-ring))) 
    581               (setq kmacro-ring 
    582                     (cons 
    583                      (list last-kbd-macro kmacro-counter kmacro-counter-format-start) 
    584                      kmacro-ring)) 
    585               (if (>= len kmacro-ring-max) 
    586                   (setcdr (nthcdr len kmacro-ring) nil)))) 
     573            (kmacro-push-ring 
     574             (list last-kbd-macro kmacro-counter kmacro-counter-format-start))) 
    587575        (setq kmacro-counter (or (if arg (prefix-numeric-value arg)) 
    588576                                 kmacro-initial-counter-value