Mercurial > hg > xemacs-beta
comparison lisp/isearch-mode.el @ 440:8de8e3f6228a r21-2-28
Import from CVS: tag r21-2-28
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:33:38 +0200 |
| parents | 3ecd8885ac67 |
| children | abe6d1db359e |
comparison
equal
deleted
inserted
replaced
| 439:357dd071b03c | 440:8de8e3f6228a |
|---|---|
| 531 isearch-just-started t | 531 isearch-just-started t |
| 532 | 532 |
| 533 isearch-opoint (point) | 533 isearch-opoint (point) |
| 534 search-ring-yank-pointer nil | 534 search-ring-yank-pointer nil |
| 535 regexp-search-ring-yank-pointer nil | 535 regexp-search-ring-yank-pointer nil |
| 536 isearch-opened-extents nil | 536 isearch-unhidden-extents nil |
| 537 isearch-window-configuration (current-window-configuration) | 537 isearch-window-configuration (current-window-configuration) |
| 538 | 538 |
| 539 ;; #### What we really need is a buffer-local | 539 ;; #### What we really need is a buffer-local |
| 540 ;; overriding-local-map. See isearch-pre-command-hook for | 540 ;; overriding-local-map. See isearch-pre-command-hook for |
| 541 ;; more details. | 541 ;; more details. |
| 1337 ;; The search status stack. | 1337 ;; The search status stack. |
| 1338 | 1338 |
| 1339 (defun isearch-top-state () | 1339 (defun isearch-top-state () |
| 1340 (let ((cmd (car isearch-cmds))) | 1340 (let ((cmd (car isearch-cmds))) |
| 1341 ;; #### Grr, this is so error-prone. If you add something to | 1341 ;; #### Grr, this is so error-prone. If you add something to |
| 1342 ;; isearch-push-state, don't forget to update this. I thout I'd | 1342 ;; isearch-push-state, don't forget to update this. I thought I'd |
| 1343 ;; make a list of variables, and just do (mapcar* #'set vars | 1343 ;; make a list of variables, and just do (mapcar* #'set vars |
| 1344 ;; values), but the (point) thing would spoil it, leaving to more | 1344 ;; values), but the (point) thing would spoil it, leaving to more |
| 1345 ;; complication. | 1345 ;; complication. |
| 1346 (setq isearch-string (car cmd) | 1346 (setq isearch-string (car cmd) |
| 1347 isearch-message (car (cdr cmd)) | 1347 isearch-message (car (cdr cmd)) |
| 1602 ;; this face is initialized by faces.el since isearch is preloaded. | 1602 ;; this face is initialized by faces.el since isearch is preloaded. |
| 1603 ;(make-face 'isearch) | 1603 ;(make-face 'isearch) |
| 1604 | 1604 |
| 1605 (defun isearch-make-extent (begin end) | 1605 (defun isearch-make-extent (begin end) |
| 1606 (let ((x (make-extent begin end (current-buffer)))) | 1606 (let ((x (make-extent begin end (current-buffer)))) |
| 1607 ;; make the isearch extent always take prescedence over any mouse- | 1607 ;; make the isearch extent always take precedence over any mouse- |
| 1608 ;; highlighted extents we may be passing through, since isearch, being | 1608 ;; highlighted extents we may be passing through, since isearch, being |
| 1609 ;; modal, is more interesting (there's nothing they could do with a | 1609 ;; modal, is more interesting (there's nothing they could do with a |
| 1610 ;; mouse-highlighted extent while in the midst of a search anyway). | 1610 ;; mouse-highlighted extent while in the midst of a search anyway). |
| 1611 (set-extent-priority x (+ mouse-highlight-priority 2)) | 1611 (set-extent-priority x (+ mouse-highlight-priority 2)) |
| 1612 (set-extent-face x 'isearch) | 1612 (set-extent-face x 'isearch) |
| 1912 ;; The search string is the same. We need to do something | 1912 ;; The search string is the same. We need to do something |
| 1913 ;; if our position has changed. | 1913 ;; if our position has changed. |
| 1914 | 1914 |
| 1915 ;; It would be nice if we didn't have to do this; however, | 1915 ;; It would be nice if we didn't have to do this; however, |
| 1916 ;; window-start doesn't support a GUARANTEE flag, so we must | 1916 ;; window-start doesn't support a GUARANTEE flag, so we must |
| 1917 ;; force redisplay to get the correct valye for start and end | 1917 ;; force redisplay to get the correct value for start and end |
| 1918 ;; of window. | 1918 ;; of window. |
| 1919 (sit-for 0) | 1919 (sit-for 0) |
| 1920 | 1920 |
| 1921 ;; Check whether our location has changed. | 1921 ;; Check whether our location has changed. |
| 1922 (let ((start (window-start)) | 1922 (let ((start (window-start)) |