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/isearch.el

    r4058 r4079  
    831831(defun isearch-update-ring (string &optional regexp) 
    832832  "Add STRING to the beginning of the search ring. 
    833 REGEXP says which ring to use." 
    834   (if regexp 
    835       (if (or (null regexp-search-ring) 
    836               (not (string= string (car regexp-search-ring)))) 
    837           (progn 
    838             (push string regexp-search-ring) 
    839             (if (> (length regexp-search-ring) regexp-search-ring-max) 
    840                 (setcdr (nthcdr (1- search-ring-max) regexp-search-ring) 
    841                         nil)))) 
    842     (if (or (null search-ring) 
    843             (not (string= string (car search-ring)))) 
    844         (progn 
    845           (push string search-ring) 
    846           (if (> (length search-ring) search-ring-max) 
    847               (setcdr (nthcdr (1- search-ring-max) search-ring) nil)))))) 
     833REGEXP if non-nil says use the regexp search ring." 
     834  (add-to-history 
     835   (if regexp 'regexp-search-ring 'search-ring) 
     836   string 
     837   (if regexp regexp-search-ring-max search-ring-max))) 
    848838 
    849839;; Switching buffers should first terminate isearch-mode.