(isearch-printing-char): Don't check

keyboard-coding-system.  Call
isearch-process-search-multibyte-characters only when
current-input-method is non-nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88f6b68b40d8ccd66040fd232fbaeb20d79d5328..b8adc68d0eb8d18121754318a3546c55239937da 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-28  Kenichi Handa  <handa@ni.aist.go.jp>
+
+       * isearch.el (isearch-printing-char): Don't check
+       keyboard-coding-system.  Call
+       isearch-process-search-multibyte-characters only when
+       current-input-method is non-nil.
+
 2008-02-27  Kim F. Storm  <storm@cua.dk>
 
        * disp-table.el (make-glyph-code): Encode as cons if face id > 63.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index bbe2363d57bd7285e7a323e08a3735f86d8c46f6..750ed129b7e02dfcdf00006c7f6b2e4571db0d17 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1842,15 +1842,9 @@ Isearch mode."
   (let ((char last-command-char))
     (if (= char ?\S-\ )
        (setq char ?\s))
-    (if (and enable-multibyte-characters
-            (>= char ?\200)
-            (<= char ?\377))
-       (if (keyboard-coding-system)
-           (isearch-process-search-multibyte-characters char)
-         (isearch-process-search-char (unibyte-char-to-multibyte char)))
-      (if current-input-method
-         (isearch-process-search-multibyte-characters char)
-       (isearch-process-search-char char)))))
+    (if current-input-method
+       (isearch-process-search-multibyte-characters char)
+      (isearch-process-search-char char))))
 
 (defun isearch-process-search-char (char)
   ;; * and ? are special in regexps when not preceded by \.