4 files changed, 11 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e9bd5bc718..47d352df116 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-26  Eli Zaretskii  <eliz@gnu.org>
 
+        * simple.el (prog-mode): Set bidi-paragraph-direction to
+        left-to-right.
+
         * term/pc-win.el (x-get-selection-internal): Emulation for MS-DOS.
 
 2010-11-26  Glenn Morris  <rgm@gnu.org>
diff --git a/lisp/simple.el b/lisp/simple.el
index aa4b9a97182..3b9bfc0519a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -441,7 +441,9 @@ Other major modes are defined by comparison with this one."
 (define-derived-mode prog-mode fundamental-mode "Prog"
   "Major mode for editing programming language source code."
   (set (make-local-variable 'require-final-newline) mode-require-final-newline)
-  (set (make-local-variable 'parse-sexp-ignore-comments) t))
+  (set (make-local-variable 'parse-sexp-ignore-comments) t)
+  ;; Any programming language is always written left to right.
+  (setq bidi-paragraph-direction 'left-to-right))
 
 ;; Making and deleting lines.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index eac550a7334..8c98b52e6aa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-26  Eli Zaretskii  <eliz@gnu.org>
 
+        * xdisp.c (set_message_1): Force paragraph direction in echo area
+        be left-to-right.
+
         * keyboard.c (make_lispy_position): Put a meaningful value in yret
         when the click is on the header or mode line.
 
diff --git a/src/xdisp.c b/src/xdisp.c
index fd80d7a0208..77e9db2e5eb 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9384,6 +9384,8 @@ set_message_1 (EMACS_INT a1, Lisp_Object a2, EMACS_INT nbytes, EMACS_INT multiby
     Fset_buffer_multibyte (message_enable_multibyte ? Qt : Qnil);
 
   current_buffer->truncate_lines = message_truncate_lines ? Qt : Qnil;
+  if (!NILP (current_buffer->bidi_display_reordering))
+    current_buffer->bidi_paragraph_direction = Qleft_to_right;
 
   /* Insert new message at BEG.  */
   TEMP_SET_PT_BOTH (BEG, BEG_BYTE);