aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2011-12-02 12:35:17 +0200
committerEli Zaretskii2011-12-02 12:35:17 +0200
commit66e0570cde6df61e4e1ec4ce54bac157770dc0b6 (patch)
tree756a8fea5b731c1330e01fbfc2defeaa033732a6
parent02b16839f5242e93a234e7ebb0578d5aebb529ca (diff)
downloademacs-66e0570cde6df61e4e1ec4ce54bac157770dc0b6.tar.gz
emacs-66e0570cde6df61e4e1ec4ce54bac157770dc0b6.zip
Fix part 3 of bug #10183 with input-method prompt in I-search.
lisp/isearch.el (isearch-message-prefix): Run the input method part of the prompt through bidi-string-mark-left-to-right.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/isearch.el6
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43c232bc375..b5b3eb0231d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-12-02 Eli Zaretskii <eliz@gnu.org>
2
3 * isearch.el (isearch-message-prefix): Run the input method part
4 of the prompt through bidi-string-mark-left-to-right. (Bug#10183)
5
12011-12-02 Juri Linkov <juri@jurta.org> 62011-12-02 Juri Linkov <juri@jurta.org>
2 7
3 * isearch.el (isearch-occur): Use `word-search-regexp' for 8 * isearch.el (isearch-occur): Use `word-search-regexp' for
diff --git a/lisp/isearch.el b/lisp/isearch.el
index f8aa8e4adc3..1bebaef8a03 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2225,7 +2225,11 @@ If there is no completion possible, say so and continue searching."
2225 (if nonincremental "search" "I-search") 2225 (if nonincremental "search" "I-search")
2226 (if isearch-forward "" " backward") 2226 (if isearch-forward "" " backward")
2227 (if current-input-method 2227 (if current-input-method
2228 (concat " [" current-input-method-title "]: ") 2228 ;; Input methods for RTL languages use RTL
2229 ;; characters for their title, and that messes
2230 ;; up the display of the prompt.
2231 (bidi-string-mark-left-to-right
2232 (concat " [" current-input-method-title "]: "))
2229 ": ") 2233 ": ")
2230 ))) 2234 )))
2231 (propertize (concat (upcase (substring m 0 1)) (substring m 1)) 2235 (propertize (concat (upcase (substring m 0 1)) (substring m 1))