From: Eli Zaretskii Date: Sun, 25 Apr 2010 17:06:41 +0000 (+0300) Subject: Fix crash with bidi display on the last empty line (bug#6030). X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~390 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6bdf5d652360b79c8ee6194e8dd1b23ef4721a53;p=emacs.git Fix crash with bidi display on the last empty line (bug#6030). xdisp.c (display_line): Don't assume 2nd call to get_next_display_element cannot return zero. (Bug#6030) Move code that bidi-iterates out of display property to a separate function. xdisp.c (iterate_out_of_display_property): New function, body from pop_it. (pop_it): Use it. --- 6bdf5d652360b79c8ee6194e8dd1b23ef4721a53 diff --cc src/ChangeLog index 2119d642ec0,58fdad2d1d2..e7ed7c36f78 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,10 -1,10 +1,17 @@@ + 2010-04-25 Eli Zaretskii + - * xdisp.c (display_line): Fix crash with bidi display on the last - empty line. (Bug#6030) ++ * xdisp.c (display_line): Don't assume 2nd call to ++ get_next_display_element cannot return zero. (Bug#6030) + (iterate_out_of_display_property): New function, body from pop_it. + (pop_it): Use it. + +2010-04-24 Glenn Morris + + * m/amdx86-64.h (START_FILES, LIB_STANDARD) [__OpenBSD__]: + For clarity, revert to using fixed /usr/lib rather than $CRT_DIR. + (START_FILES, LIB_STANDARD) [__FreeBSD__]: Merge into the generic case, + since CRT_DIR defaults to /usr/lib. Suggested by Dan Nicolaescu. + 2010-04-24 Eli Zaretskii * xdisp.c (display_line): Use `reseat' instead of `reseat_1', and