This commits the exact copies of files I had before switch to bzr.

3 files changed, 2 insertions, 4 deletions

diff --git a/src/Makefile.in b/src/Makefile.in
index 60e7ac1ee0f..dbb4f711185 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1052,7 +1052,7 @@ doc.o: buildobj.h
 
 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 --git a/src/dispextern.h b/src/dispextern.h
index 58e6ff91338..510ffe50dab 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1799,7 +1799,7 @@ struct bidi_it {
   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 --git a/src/dispnew.c b/src/dispnew.c
index b5764ac7fe3..94bbab225f9 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1760,8 +1760,6 @@ check_matrix_invariants (w)
 
       /* 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)