* lisp/isearch.el (isearch-quote-char): Comment out converting unibyte

to multibyte, thus syncing with its `quoted-insert' counterpart.

Fixes: debbugs:15166

2 files changed, 14 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 60f770b3e0c..822d0eaf17f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-27  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-quote-char): Comment out converting unibyte
+        to multibyte, thus syncing with its `quoted-insert' counterpart.
+        (Bug#15166)
+
 2013-08-27  Martin Rudalics  <rudalics@gmx.at>
 
         * window.el (display-buffer-use-some-window): Add missing
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 3ff75059b1a..345e7d8b4e9 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2430,10 +2430,14 @@ With argument, add COUNT copies of the character."
         (if (subregexp-context-p isearch-string (length isearch-string))
             (isearch-process-search-string "[ ]" " ")
           (isearch-process-search-char char count))
-      (and enable-multibyte-characters
-           (>= char ?\200)
-           (<= char ?\377)
-           (setq char (unibyte-char-to-multibyte char)))
+      ;; This used to assume character codes 0240 - 0377 stand for
+      ;; characters in some single-byte character set, and converted them
+      ;; to Emacs characters.  But in 23.1 this feature is deprecated
+      ;; in favor of inserting the corresponding Unicode characters.
+      ;; (and enable-multibyte-characters
+      ;;      (>= char ?\200)
+      ;;      (<= char ?\377)
+      ;;      (setq char (unibyte-char-to-multibyte char)))
       (isearch-process-search-char char count))))
 
 (defun isearch-printing-char (&optional char count)