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

[Miles Bader]

Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.212.2.7 emacs/lisp/isearch.el:1.212.2.8
*** emacs/lisp/isearch.el:1.212.2.7     Tue Jul  6 09:44:44 2004
--- emacs/lisp/isearch.el       Tue Jul  6 10:17:16 2004
***************
*** 999,1005 ****
  
    (if (equal isearch-string "")
        (setq isearch-success t)
!     (if (and isearch-success (equal (match-end 0) (match-beginning 0))
             (not isearch-just-started))
        ;; If repeating a search that found
        ;; an empty string, ensure we advance.
--- 999,1006 ----
  
    (if (equal isearch-string "")
        (setq isearch-success t)
!     (if (and isearch-success
!            (equal (point) isearch-other-end)
             (not isearch-just-started))
        ;; If repeating a search that found
        ;; an empty string, ensure we advance.
***************
*** 1764,1770 ****
    (let ((cursor-in-echo-area ellipsis)
        (m (concat
            (isearch-message-prefix c-q-hack ellipsis isearch-nonincremental)
!           isearch-message
            (isearch-message-suffix c-q-hack ellipsis)
            )))
      (if c-q-hack
--- 1765,1777 ----
    (let ((cursor-in-echo-area ellipsis)
        (m (concat
            (isearch-message-prefix c-q-hack ellipsis isearch-nonincremental)
!           (if (and (not isearch-success)
!                      (string-match " +$" isearch-message))
!                 (concat
!                  (substring isearch-message 0 (match-beginning 0))
!                  (propertize (substring isearch-message (match-beginning 0))
!                              'face 'trailing-whitespace))
!               isearch-message)
            (isearch-message-suffix c-q-hack ellipsis)
            )))
      (if c-q-hack
***************
*** 1811,1817 ****
  
  ;; Searching
  
! (defvar isearch-search-fun-function nil "Override `isearch-function-fun'.")
  
  (defun isearch-search-fun ()
    "Return the function to use for the search.
--- 1818,1828 ----
  
  ;; Searching
  
! (defvar isearch-search-fun-function nil
!   "Override `isearch-search-fun'.
! This function should return the search function for isearch to use.
! It will call this function with three arguments
! as if it were `search-forward'.")
  
  (defun isearch-search-fun ()
    "Return the function to use for the search.