summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorJuri Linkov <juri@jurta.org>2013-08-27 18:57:16 +0300
committerJuri Linkov <juri@jurta.org>2013-08-27 18:57:16 +0300
commit26f98a7d3fb2ed8b5bb1befcd8e8507de516db34 (patch)
tree85b13c6192d2ab30205507e1914c07bbf2c5bdf2 /lisp
parent3ed86db9c6ab0beb6cbe76e1ac5685856e8f8c59 (diff)
downloademacs-26f98a7d3fb2ed8b5bb1befcd8e8507de516db34.tar.gz
* lisp/isearch.el (isearch-quote-char): Comment out converting unibyte
to multibyte, thus syncing with its `quoted-insert' counterpart. Fixes: debbugs:15166
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/isearch.el12
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)