From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 2 Dec 2011 10:35:17 +0000 (+0200)
Subject: Fix part 3 of bug #10183 with input-method prompt in I-search.
X-Git-Tag: emacs-pretest-24.0.93~232^2~36
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66e0570cde6df61e4e1ec4ce54bac157770dc0b6;p=emacs.git

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43c232bc375..b5b3eb0231d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-02  Eli Zaretskii  <eliz@gnu.org>
+
+	* isearch.el (isearch-message-prefix): Run the input method part
+	of the prompt through bidi-string-mark-left-to-right.  (Bug#10183)
+
 2011-12-02  Juri Linkov  <juri@jurta.org>
 
 	* 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."
 		   (if nonincremental "search" "I-search")
 		   (if isearch-forward "" " backward")
 		   (if current-input-method
-		       (concat " [" current-input-method-title "]: ")
+		       ;; Input methods for RTL languages use RTL
+		       ;; characters for their title, and that messes
+		       ;; up the display of the prompt.
+		       (bidi-string-mark-left-to-right
+			(concat " [" current-input-method-title "]: "))
 		     ": ")
 		   )))
     (propertize (concat (upcase (substring m 0 1)) (substring m 1))