98 |
(defun isearch-process-search-multibyte-characters (last-char) |
(defun isearch-process-search-multibyte-characters (last-char) |
99 |
(if (eq this-command 'isearch-printing-char) |
(if (eq this-command 'isearch-printing-char) |
100 |
(let ((overriding-terminal-local-map nil) |
(let ((overriding-terminal-local-map nil) |
101 |
(prompt (concat (isearch-message-prefix))) |
(prompt (isearch-message-prefix)) |
102 |
(minibuffer-local-map isearch-minibuffer-local-map) |
(minibuffer-local-map isearch-minibuffer-local-map) |
103 |
str) |
str junk-hist) |
104 |
(if isearch-input-method-function |
(if isearch-input-method-function |
105 |
(let (;; Let input method work rather tersely. |
(let (;; Let input method work rather tersely. |
106 |
(input-method-verbose-flag nil)) |
(input-method-verbose-flag nil)) |
108 |
(cons 'with-input-method |
(cons 'with-input-method |
109 |
(cons last-char unread-command-events)) |
(cons last-char unread-command-events)) |
110 |
;; Inherit current-input-method in a minibuffer. |
;; Inherit current-input-method in a minibuffer. |
111 |
str (read-string prompt isearch-message nil nil t)) |
str (read-string prompt isearch-message 'junk-hist nil t)) |
112 |
(if (not str) |
(if (or (not str) (< (length str) (length isearch-message))) |
113 |
;; All inputs were deleted while the input method |
;; All inputs were deleted while the input method |
114 |
;; was working. |
;; was working. |
115 |
(setq str "") |
(setq str "") |
124 |
(setq unread-command-events |
(setq unread-command-events |
125 |
(cons 'with-keyboard-coding |
(cons 'with-keyboard-coding |
126 |
(cons last-char unread-command-events)) |
(cons last-char unread-command-events)) |
127 |
str (read-string prompt))) |
str (read-string prompt nil 'junk-hist))) |
128 |
|
|
129 |
(if (and str (> (length str) 0)) |
(if (and str (> (length str) 0)) |
130 |
(let ((unread-command-events nil)) |
(let ((unread-command-events nil)) |