Mercurial > hg > xemacs-beta
comparison lisp/prim/isearch-mode.el @ 193:f53b5ca2e663 r20-3b23
Import from CVS: tag r20-3b23
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 09:58:30 +0200 |
| parents | 1856695b1fa9 |
| children | acd284d43ca1 |
comparison
equal
deleted
inserted
replaced
| 192:9d35321dd38c | 193:f53b5ca2e663 |
|---|---|
| 558 (if (and (buffer-live-p isearch-buffer) | 558 (if (and (buffer-live-p isearch-buffer) |
| 559 (/= (point isearch-buffer) isearch-opoint)) | 559 (/= (point isearch-buffer) isearch-opoint)) |
| 560 (progn | 560 (progn |
| 561 (push-mark isearch-opoint t nil isearch-buffer) | 561 (push-mark isearch-opoint t nil isearch-buffer) |
| 562 (or executing-kbd-macro (> (minibuffer-depth) 0) | 562 (or executing-kbd-macro (> (minibuffer-depth) 0) |
| 563 (message "Mark saved where search started")))) | 563 (display-message 'command "Mark saved where search started")))) |
| 564 ) | 564 ) |
| 565 (setq isearch-buffer nil) | 565 (setq isearch-buffer nil) |
| 566 ) ; inhibit-quit is t before here | 566 ) ; inhibit-quit is t before here |
| 567 | 567 |
| 568 (if (> (length isearch-string) 0) | 568 (if (> (length isearch-string) 0) |
| 668 ;; If the first character the user types when we prompt them | 668 ;; If the first character the user types when we prompt them |
| 669 ;; for a string is the yank-word character, then go into | 669 ;; for a string is the yank-word character, then go into |
| 670 ;; word-search mode. Otherwise unread that character and | 670 ;; word-search mode. Otherwise unread that character and |
| 671 ;; read a string the normal way. | 671 ;; read a string the normal way. |
| 672 (let ((cursor-in-echo-area t)) | 672 (let ((cursor-in-echo-area t)) |
| 673 (message "%s" prompt) | 673 (display-message 'prompt prompt) |
| 674 (setq event (next-command-event)) | 674 (setq event (next-command-event)) |
| 675 (if (eq 'isearch-yank-word | 675 (if (eq 'isearch-yank-word |
| 676 (lookup-key isearch-mode-map (vector event))) | 676 (lookup-key isearch-mode-map (vector event))) |
| 677 (setq isearch-word t) | 677 (setq isearch-word t) |
| 678 (setq unread-command-event event))) | 678 (setq unread-command-event event))) |
| 1182 (m (concat | 1182 (m (concat |
| 1183 (isearch-message-prefix c-q-hack) | 1183 (isearch-message-prefix c-q-hack) |
| 1184 isearch-message | 1184 isearch-message |
| 1185 (isearch-message-suffix c-q-hack) | 1185 (isearch-message-suffix c-q-hack) |
| 1186 ))) | 1186 ))) |
| 1187 (if c-q-hack m (message "%s" m)))) | 1187 (if c-q-hack m (display-message 'progress (format "%s" m))))) |
| 1188 | 1188 |
| 1189 (defun isearch-message-prefix (&optional c-q-hack nonincremental) | 1189 (defun isearch-message-prefix (&optional c-q-hack nonincremental) |
| 1190 ;; If about to search, and previous search regexp was invalid, | 1190 ;; If about to search, and previous search regexp was invalid, |
| 1191 ;; check that it still is. If it is valid now, | 1191 ;; check that it still is. If it is valid now, |
| 1192 ;; let the message we display while searching say that it is valid. | 1192 ;; let the message we display while searching say that it is valid. |