diff options
| -rw-r--r-- | lisp/isearch.el | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index 1def08ace63..60ab8ed00db 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> | 5 | ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu> |
| 6 | 6 | ||
| 7 | ;; |$Date: 1993/07/31 18:39:09 $|$Revision: 1.47 $ | 7 | ;; |$Date: 1993/08/10 04:14:17 $|$Revision: 1.48 $ |
| 8 | 8 | ||
| 9 | ;; This file is not yet part of GNU Emacs, but it is based almost | 9 | ;; This file is not yet part of GNU Emacs, but it is based almost |
| 10 | ;; entirely on isearch.el which is part of GNU Emacs. | 10 | ;; entirely on isearch.el which is part of GNU Emacs. |
| @@ -717,8 +717,7 @@ If first char entered is \\[isearch-yank-word], then do word search instead." | |||
| 717 | (let* (;; Why does following read-char echo? | 717 | (let* (;; Why does following read-char echo? |
| 718 | ;;(echo-keystrokes 0) ;; not needed with above message | 718 | ;;(echo-keystrokes 0) ;; not needed with above message |
| 719 | (e (let ((cursor-in-echo-area t)) | 719 | (e (let ((cursor-in-echo-area t)) |
| 720 | (if isearch-event-data-type | 720 | (read-event))) |
| 721 | (allocate-event) (read-char)))) | ||
| 722 | ;; Binding minibuffer-history-symbol to nil is a work-around | 721 | ;; Binding minibuffer-history-symbol to nil is a work-around |
| 723 | ;; for some incompatibility with gmhist. | 722 | ;; for some incompatibility with gmhist. |
| 724 | (minibuffer-history-symbol)) | 723 | (minibuffer-history-symbol)) |
| @@ -730,12 +729,7 @@ If first char entered is \\[isearch-yank-word], then do word search instead." | |||
| 730 | ;; no check is made here. | 729 | ;; no check is made here. |
| 731 | (message (isearch-message-prefix nil nil t)) | 730 | (message (isearch-message-prefix nil nil t)) |
| 732 | (if (eq 'isearch-yank-word | 731 | (if (eq 'isearch-yank-word |
| 733 | (lookup-key | 732 | (lookup-key isearch-mode-map (vector e))) |
| 734 | isearch-mode-map | ||
| 735 | (char-to-string | ||
| 736 | (if isearch-event-data-type | ||
| 737 | (or (event-to-character (next-command-event e)) 0) | ||
| 738 | e)))) | ||
| 739 | (setq isearch-word t ;; so message-prefix is right | 733 | (setq isearch-word t ;; so message-prefix is right |
| 740 | isearch-new-word t) | 734 | isearch-new-word t) |
| 741 | (isearch-unread e)) | 735 | (isearch-unread e)) |