From 758710cb94511217f61909dbb48708a29503f44b Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 28 Feb 2008 01:58:07 +0000 Subject: [PATCH] (isearch-printing-char): Don't check keyboard-coding-system. Call isearch-process-search-multibyte-characters only when current-input-method is non-nil. --- lisp/ChangeLog | 7 +++++++ lisp/isearch.el | 12 +++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 88f6b68b40d..b8adc68d0eb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2008-02-28 Kenichi Handa + + * 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 * disp-table.el (make-glyph-code): Encode as cons if face id > 63. diff --git a/lisp/isearch.el b/lisp/isearch.el index bbe2363d57b..750ed129b7e 100644 --- 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 \. -- 2.39.2