Mercurial > emacs
comparison lisp/isearch.el @ 91073:4bc33ffdda1a
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 27 Oct 2007 09:12:07 +0000 |
parents | 14c4a6aac623 6c0aa34f6c37 |
children | 880960b70474 |
comparison
equal
deleted
inserted
replaced
91072:74ab3ea909f9 | 91073:4bc33ffdda1a |
---|---|
2029 (when (and pos2 | 2029 (when (and pos2 |
2030 (or (not pos1) | 2030 (or (not pos1) |
2031 (if isearch-forward (< pos2 pos1) (> pos2 pos1)))) | 2031 (if isearch-forward (< pos2 pos1) (> pos2 pos1)))) |
2032 (setq pos1 pos2) | 2032 (setq pos1 pos2) |
2033 (set-match-data match-data))))) | 2033 (set-match-data match-data))))) |
2034 (if pos1 | 2034 (when pos1 |
2035 (goto-char pos1)) | 2035 ;; When using multiple buffers isearch, switch to the new buffer here, |
2036 ;; because `save-excursion' above doesn't allow doing it inside funcall. | |
2037 (if (and isearch-buffers-next-buffer-function | |
2038 (buffer-live-p isearch-buffers-current-buffer)) | |
2039 (switch-to-buffer isearch-buffers-current-buffer)) | |
2040 (goto-char pos1)) | |
2036 pos1)) | 2041 pos1)) |
2037 | 2042 |
2038 (defun isearch-search () | 2043 (defun isearch-search () |
2039 ;; Do the search with the current search string. | 2044 ;; Do the search with the current search string. |
2040 (if isearch-message-function | 2045 (if isearch-message-function |