Merge from emacs-24; up to 2012-11-03T05:11:34Z!dmantipov@yandex.ru

5 files changed, 80 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index be10016fc33..16b694e6e24 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,21 @@
+2012-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * lisp.mk: Adjust comments to the fact that term/internal is now
+        loaded from loadup.el.
+
+        * msdos.c (msdos_abort): Rename from emacs_abort, and make static.
+        (msdos_fatal_signal): New function.
+        (XMenuActivate): Adjust the call to kbd_buffer_events_waiting to
+        its argument list.
+
+        * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Define to "inline"
+        for GCC versions before 4.
+        (emacs_raise): Define to call msdos_fatal_signal.
+
+        * xdisp.c (init_from_display_pos): Fix initialization of the bidi
+        iterator when starting in the middle of a display or overlay
+        string.  (Bug#12745)
+
 2012-11-03  Paul Eggert  <eggert@cs.ucla.edu>
 
         Fix data-loss with --batch (Bug#9574).
diff --git a/src/conf_post.h b/src/conf_post.h
index 6056821d4a7..da3c3bd58b0 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -110,8 +110,17 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 #else
 # define lstat stat
 #endif
+/* The "portable" definition of _GL_INLINE on config.h does not work
+   with DJGPP GCC 3.4.4: it causes unresolved externals in sysdep.c,
+   although lib/execinfo.h is included and the inline functions there
+   are visible.  */
+#if __GNUC__ < 4
+# define _GL_EXECINFO_INLINE inline
+#endif
 /* End of gnulib-related stuff.  */
 
+#define emacs_raise(sig) msdos_fatal_signal (sig)
+
 #ifndef HAVE_SETPGID
 # ifdef USG
 #  define setpgid(pid, pgid) setpgrp ()
diff --git a/src/lisp.mk b/src/lisp.mk
index 1f459d4d5f1..8c2710110e3 100644
--- a/src/lisp.mk
+++ b/src/lisp.mk
@@ -34,9 +34,9 @@
 ## that does not have an explicit .el extension, but beware of any
 ## no-byte-compile ones.
 
-## Confusingly, term/internal is not in loadup, but is unconditionally
-## loaded by pc-win, which is.  Ditto for international/cp51932 and
-## international/eucjp-ms, loaded from language/japanese.
+## Confusingly, international/cp51932 and international/eucjp-ms are
+## unconditionally loaded from language/japanese, instead of being
+## loaded directly from loadup.el; FIXME.
 
 ## Note that this list should not include lisp files which might not
 ## be present, like site-load.el and site-init.el; this makefile
diff --git a/src/msdos.c b/src/msdos.c
index bac6b977fdf..79f0be48892 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -3305,7 +3305,7 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
      Emacs will process them after we return and surprise the user.  */
   discard_mouse_events ();
   mouse_clear_clicks ();
-  if (!kbd_buffer_events_waiting (1))
+  if (!kbd_buffer_events_waiting ())
     clear_input_pending ();
   /* Allow mouse events generation by dos_rawgetc.  */
   mouse_preempted--;
@@ -4214,8 +4214,8 @@ init_gettimeofday (void)
 }
 #endif
 
-void
-emacs_abort (void)
+static void
+msdos_abort (void)
 {
   dos_ttcooked ();
   ScreenSetCursor (10, 0);
@@ -4233,6 +4233,15 @@ emacs_abort (void)
 }
 
 void
+msdos_fatal_signal (int sig)
+{
+  if (sig == SIGABRT)
+    msdos_abort ();
+  else
+    raise (sig);
+}
+
+void
 syms_of_msdos (void)
 {
   recent_doskeys = Fmake_vector (make_number (NUM_RECENT_DOSKEYS), Qnil);
diff --git a/src/xdisp.c b/src/xdisp.c
index b235f92edfe..1ff7819f34d 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -928,6 +928,7 @@ static enum move_it_result
        move_it_in_display_line_to (struct it *, ptrdiff_t, int,
                                    enum move_operation_enum);
 void move_it_vertically_backward (struct it *, int);
+static void get_visually_first_element (struct it *);
 static void init_to_row_start (struct it *, struct window *,
                                struct glyph_row *);
 static int init_to_row_end (struct it *, struct window *,
@@ -3113,6 +3114,40 @@ init_from_display_pos (struct it *it, struct window *w, struct display_pos *pos)
       eassert (STRINGP (it->string));
       it->current.string_pos = pos->string_pos;
       it->method = GET_FROM_STRING;
+      it->end_charpos = SCHARS (it->string);
+      /* Set up the bidi iterator for this overlay string.  */
+      if (it->bidi_p)
+        {
+          it->bidi_it.string.lstring = it->string;
+          it->bidi_it.string.s = NULL;
+          it->bidi_it.string.schars = SCHARS (it->string);
+          it->bidi_it.string.bufpos = it->overlay_strings_charpos;
+          it->bidi_it.string.from_disp_str = it->string_from_display_prop_p;
+          it->bidi_it.string.unibyte = !it->multibyte_p;
+          bidi_init_it (IT_STRING_CHARPOS (*it), IT_STRING_BYTEPOS (*it),
+                        FRAME_WINDOW_P (it->f), &it->bidi_it);
+
+          /* Synchronize the state of the bidi iterator with
+             pos->string_pos.  For any string position other than
+             zero, this will be done automagically when we resume
+             iteration over the string and get_visually_first_element
+             is called.  But if string_pos is zero, and the string is
+             to be reordered for display, we need to resync manually,
+             since it could be that the iteration state recorded in
+             pos ended at string_pos of 0 moving backwards in string.  */
+          if (CHARPOS (pos->string_pos) == 0)
+            {
+              get_visually_first_element (it);
+              if (IT_STRING_CHARPOS (*it) != 0)
+                do {
+                  /* Paranoia.  */
+                  eassert (it->bidi_it.charpos < it->bidi_it.string.schars);
+                  bidi_move_to_visually_next (&it->bidi_it);
+                } while (it->bidi_it.charpos != 0);
+            }
+          eassert (IT_STRING_CHARPOS (*it) == it->bidi_it.charpos
+                   && IT_STRING_BYTEPOS (*it) == it->bidi_it.bytepos);
+        }
     }
 
   if (CHARPOS (pos->string_pos) >= 0)
@@ -3122,6 +3157,9 @@ init_from_display_pos (struct it *it, struct window *w, struct display_pos *pos)
          IT should already be filled with that string.  */
       it->current.string_pos = pos->string_pos;
       eassert (STRINGP (it->string));
+      if (it->bidi_p)
+        bidi_init_it (IT_STRING_CHARPOS (*it), IT_STRING_BYTEPOS (*it),
+                      FRAME_WINDOW_P (it->f), &it->bidi_it);
     }
 
   /* Restore position in display vector translations, control