diff options
author | Eli Zaretskii <eliz@gnu.org> | 2011-07-02 13:05:14 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2011-07-02 13:05:14 +0300 |
commit | a2eaa31ddf8dabc71436dcb120ad7970a40045a4 (patch) | |
tree | df11fc0eb04a1bf29f045efb190956a142b4269a /lisp/emacs-lisp/gulp.el | |
parent | f3014ef5b24ac42ec714b48148b7b604b47f7468 (diff) | |
download | emacs-a2eaa31ddf8dabc71436dcb120ad7970a40045a4.tar.gz emacs-a2eaa31ddf8dabc71436dcb120ad7970a40045a4.tar.bz2 emacs-a2eaa31ddf8dabc71436dcb120ad7970a40045a4.zip |
Fix the use case of popping from display property.
src/dispextern.h (struct iterator_stack_entry, struct it): New
member from_disp_prop_p.
src/xdisp.c (push_it, pop_it): Save and restore from_disp_prop_p.
(handle_single_display_spec, push_display_prop): Set the
from_disp_prop_p flag.
(get_overlay_strings_1): Reset the from_disp_prop_p flag.
(pop_it): Call iterate_out_of_display_property only if we are
popping after iteration over a string that came from a display
property. Fix a typo in popping stretch info. Add an assertion
for verifying that the iterator position is in sync with the bidi
iterator.
(handle_single_display_spec, get_overlay_strings_1)
(push_display_prop): Fix initialization of paragraph direction for
string when that of the parent object is not yet determined.
Diffstat (limited to 'lisp/emacs-lisp/gulp.el')
0 files changed, 0 insertions, 0 deletions