]> code.delx.au - gnu-emacs/commitdiff
(isearch-edit-string): Use read-event, not read-char.
authorRichard M. Stallman <rms@gnu.org>
Fri, 13 Aug 1993 06:32:49 +0000 (06:32 +0000)
committerRichard M. Stallman <rms@gnu.org>
Fri, 13 Aug 1993 06:32:49 +0000 (06:32 +0000)
lisp/isearch.el

index 1def08ace636c1371ae9ab90fa9c06e75367f2d0..60ab8ed00db58fe46814348d9616ef4783d93b93 100644 (file)
@@ -4,7 +4,7 @@
 
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 
-;; |$Date: 1993/07/31 18:39:09 $|$Revision: 1.47 $
+;; |$Date: 1993/08/10 04:14:17 $|$Revision: 1.48 $
 
 ;; This file is not yet part of GNU Emacs, but it is based almost
 ;; 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."
            (let* (;; Why does following read-char echo?  
                   ;;(echo-keystrokes 0) ;; not needed with above message
                   (e (let ((cursor-in-echo-area t))
-                       (if isearch-event-data-type
-                           (allocate-event) (read-char))))
+                       (read-event)))
                   ;; Binding minibuffer-history-symbol to nil is a work-around
                   ;; for some incompatibility with gmhist.
                   (minibuffer-history-symbol))
@@ -730,12 +729,7 @@ If first char entered is \\[isearch-yank-word], then do word search instead."
              ;; no check is made here.
              (message (isearch-message-prefix nil nil t))
              (if (eq 'isearch-yank-word
-                     (lookup-key
-                      isearch-mode-map
-                      (char-to-string
-                       (if isearch-event-data-type
-                           (or (event-to-character (next-command-event e)) 0)
-                         e))))
+                     (lookup-key isearch-mode-map (vector e)))
                  (setq isearch-word t  ;; so message-prefix is right
                        isearch-new-word t)
                (isearch-unread e))