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

[Stefan Monnier]

Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.218 emacs/lisp/isearch.el:1.219
*** emacs/lisp/isearch.el:1.218 Fri Jan 24 12:12:00 2003
--- emacs/lisp/isearch.el       Tue Apr 29 16:38:53 2003
***************
*** 1,6 ****
  ;;; isearch.el --- incremental search minor mode
  
! ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1999, 2000, 2001
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Daniel LaLiberte <address@hidden>
--- 1,6 ----
  ;;; isearch.el --- incremental search minor mode
  
! ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1999, 2000, 01, 2003
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Daniel LaLiberte <address@hidden>
***************
*** 738,752 ****
        (if (or (null regexp-search-ring)
              (not (string= string (car regexp-search-ring))))
          (progn
!           (setq regexp-search-ring
!                 (cons string regexp-search-ring))
            (if (> (length regexp-search-ring) regexp-search-ring-max)
                (setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
                        nil))))
      (if (or (null search-ring)
            (not (string= string (car search-ring))))
        (progn
!         (setq search-ring (cons string search-ring))
          (if (> (length search-ring) search-ring-max)
              (setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
  
--- 738,751 ----
        (if (or (null regexp-search-ring)
              (not (string= string (car regexp-search-ring))))
          (progn
!           (push string regexp-search-ring)
            (if (> (length regexp-search-ring) regexp-search-ring-max)
                (setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
                        nil))))
      (if (or (null search-ring)
            (not (string= string (car search-ring))))
        (progn
!         (push string search-ring)
          (if (> (length search-ring) search-ring-max)
              (setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
  
***************
*** 1493,1501 ****
    ;; Helper for isearch-complete and isearch-complete-edit
    ;; Return t if completion OK, nil if no completion exists.
    (let* ((ring (if isearch-regexp regexp-search-ring search-ring))
-          (alist (mapcar (function (lambda (string) (list string))) ring))
           (completion-ignore-case case-fold-search)
!          (completion (try-completion isearch-string alist)))
      (cond
       ((eq completion t)
        ;; isearch-string stays the same
--- 1492,1499 ----
    ;; Helper for isearch-complete and isearch-complete-edit
    ;; Return t if completion OK, nil if no completion exists.
    (let* ((ring (if isearch-regexp regexp-search-ring search-ring))
           (completion-ignore-case case-fold-search)
!          (completion (try-completion isearch-string ring)))
      (cond
       ((eq completion t)
        ;; isearch-string stays the same
***************
*** 1507,1513 ****
            (if completion-auto-help
                (with-output-to-temp-buffer "*Isearch completions*"
                  (display-completion-list
!                  (all-completions isearch-string alist))))
            t)
        (and completion
             (setq isearch-string completion))))
--- 1505,1511 ----
            (if completion-auto-help
                (with-output-to-temp-buffer "*Isearch completions*"
                  (display-completion-list
!                  (all-completions isearch-string ring))))
            t)
        (and completion
             (setq isearch-string completion))))
***************
*** 1529,1535 ****
  (defun isearch-complete-edit ()
    "Same as `isearch-complete' except in the minibuffer."
    (interactive)
!   (setq isearch-string (buffer-string))
    (if (isearch-complete1)
        (progn
        (delete-field)
--- 1527,1533 ----
  (defun isearch-complete-edit ()
    "Same as `isearch-complete' except in the minibuffer."
    (interactive)
!   (setq isearch-string (field-string))
    (if (isearch-complete1)
        (progn
        (delete-field)