# HG changeset patch
# User Eli Zaretskii <eliz@gnu.org>
# Date 1262359033 18000
# Node ID a04b9ac55bc5d3598b55c5a3b435e613dd86916b
# Parent  297c59e52ecffb862323d06183d4d2d68f0fa9e2
This commits the exact copies of files I had before switch to bzr.

diff -r 297c59e52ecf -r a04b9ac55bc5 src/Makefile.in
--- a/src/Makefile.in	Fri Jan 01 10:04:53 2010 -0500
+++ b/src/Makefile.in	Fri Jan 01 10:17:13 2010 -0500
@@ -1052,7 +1052,7 @@
 
 atimer.o: atimer.c atimer.h syssignal.h systime.h lisp.h blockinput.h \
  $(config_h)
-bidi.o: bidi.c buffer.h character.h dispextern.h
+bidi.o: bidi.c buffer.h character.h dispextern.h lisp.h $(config_h)
 buffer.o: buffer.c buffer.h region-cache.h commands.h window.h \
    $(INTERVALS_H) blockinput.h atimer.h systime.h character.h \
    indent.h keyboard.h coding.h keymap.h frame.h lisp.h $(config_h)
diff -r 297c59e52ecf -r a04b9ac55bc5 src/dispextern.h
--- a/src/dispextern.h	Fri Jan 01 10:04:53 2010 -0500
+++ b/src/dispextern.h	Fri Jan 01 10:17:13 2010 -0500
@@ -1799,7 +1799,7 @@
   bidi_dir_t sor;		/* direction of start-of-run in effect */
   int scan_dir;			/* direction of text scan */
   int stack_idx;		/* index of current data on the stack */
-  /* Note: Everything from here is not copied/saved when the bidi
+  /* Note: Everything from here on is not copied/saved when the bidi
      iterator state is saved, pushed, or popped.  So only put here
      stuff that is not part of the bidi iterator's state!  */
   struct bidi_stack level_stack[BIDI_MAXLEVEL]; /* stack of embedding levels */
diff -r 297c59e52ecf -r a04b9ac55bc5 src/dispnew.c
--- a/src/dispnew.c	Fri Jan 01 10:04:53 2010 -0500
+++ b/src/dispnew.c	Fri Jan 01 10:17:13 2010 -0500
@@ -1760,8 +1760,6 @@
 
       /* Check that end position of `row' is equal to start position
 	 of next row.  */
-      /* WARNING: This assumption is blatantly incorrect when we are
-	 reordering bdirectional text for display!!  */
       if (next->enabled_p && MATRIX_ROW_DISPLAYS_TEXT_P (next))
 	{
 	  xassert (MATRIX_ROW_END_CHARPOS (row)