Mercurial > emacs
comparison lisp/isearch.el @ 85720:79ffe1cb3583
(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
clicked on the isearch message.
(isearch-resume): Call `isearch-update' at the end. Rename argument
`search' to `string' to conform to the isearch terminology.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Sun, 28 Oct 2007 14:49:07 +0000 |
| parents | 6c0aa34f6c37 |
| children | f194d32fb97d |
comparison
equal
deleted
inserted
replaced
| 85719:1655a8cabb9d | 85720:79ffe1cb3583 |
|---|---|
| 1736 (let ((ab-bel (isearch-string-out-of-window isearch-point))) | 1736 (let ((ab-bel (isearch-string-out-of-window isearch-point))) |
| 1737 (if ab-bel | 1737 (if ab-bel |
| 1738 (isearch-back-into-window (eq ab-bel 'above) isearch-point) | 1738 (isearch-back-into-window (eq ab-bel 'above) isearch-point) |
| 1739 (goto-char isearch-point))) | 1739 (goto-char isearch-point))) |
| 1740 (isearch-update)) | 1740 (isearch-update)) |
| 1741 ;; A mouse click on the isearch message starts editing the search string | |
| 1742 ((and (eq (car-safe main-event) 'down-mouse-1) | |
| 1743 (window-minibuffer-p (posn-window (event-start main-event)))) | |
| 1744 ;; Swallow the up-event. | |
| 1745 (read-event) | |
| 1746 (isearch-edit-string)) | |
| 1741 (search-exit-option | 1747 (search-exit-option |
| 1742 (let (window) | 1748 (let (window) |
| 1743 (isearch-unread-key-sequence keylist) | 1749 (isearch-unread-key-sequence keylist) |
| 1744 (setq main-event (car unread-command-events)) | 1750 (setq main-event (car unread-command-events)) |
| 1745 | 1751 |
| 2497 (unless nomore | 2503 (unless nomore |
| 2498 (setq isearch-lazy-highlight-timer | 2504 (setq isearch-lazy-highlight-timer |
| 2499 (run-at-time lazy-highlight-interval nil | 2505 (run-at-time lazy-highlight-interval nil |
| 2500 'isearch-lazy-highlight-update))))))))) | 2506 'isearch-lazy-highlight-update))))))))) |
| 2501 | 2507 |
| 2502 (defun isearch-resume (search regexp word forward message case-fold) | 2508 (defun isearch-resume (string regexp word forward message case-fold) |
| 2503 "Resume an incremental search. | 2509 "Resume an incremental search. |
| 2504 SEARCH is the string or regexp searched for. | 2510 STRING is the string or regexp searched for. |
| 2505 REGEXP non-nil means the resumed search was a regexp search. | 2511 REGEXP non-nil means the resumed search was a regexp search. |
| 2506 WORD non-nil means resume a word search. | 2512 WORD non-nil means resume a word search. |
| 2507 FORWARD non-nil means resume a forward search. | 2513 FORWARD non-nil means resume a forward search. |
| 2508 MESSAGE is the echo-area message recorded for the search resumed. | 2514 MESSAGE is the echo-area message recorded for the search resumed. |
| 2509 CASE-FOLD non-nil means the search was case-insensitive." | 2515 CASE-FOLD non-nil means the search was case-insensitive." |
| 2510 (isearch-mode forward regexp nil nil word) | 2516 (isearch-mode forward regexp nil nil word) |
| 2511 (setq isearch-string search | 2517 (setq isearch-string string |
| 2512 isearch-message message | 2518 isearch-message message |
| 2513 isearch-case-fold-search case-fold) | 2519 isearch-case-fold-search case-fold) |
| 2514 (isearch-search)) | 2520 (isearch-search) |
| 2521 (isearch-update)) | |
| 2515 | 2522 |
| 2516 ;; arch-tag: 74850515-f7d8-43a6-8a2c-ca90a4c1e675 | 2523 ;; arch-tag: 74850515-f7d8-43a6-8a2c-ca90a4c1e675 |
| 2517 ;;; isearch.el ends here | 2524 ;;; isearch.el ends here |