Mercurial > emacs
changeset 107607:a04b9ac55bc5
This commits the exact copies of files I had before switch to bzr.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Fri, 01 Jan 2010 10:17:13 -0500 |
| parents | 297c59e52ecf |
| children | 11c99bdae327 |
| files | src/Makefile.in src/dispextern.h src/dispnew.c |
| diffstat | 3 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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 */
--- 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)