[Emacs-commit] emacs/src xdisp.c

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/06/13 22:45:00

Modified files:
        src            : xdisp.c 

Log message:
        (init_from_display_pos): Don't set it->method and
        overlay_string_index after pop_it.  Add asserts.
        (handle_stop): Look for overlay strings around a display string,
        image, or composition.  Handle properties on those strings.
        (next_overlay_string): Don't set string, pos or method after pop_it.
        (get_overlay_strings_1): Split from get_overlay_strings; don't
        modify it if no overlay strings are found.
        (get_overlay_strings): Use get_overlay_strings_1.  Always set
        it->string and it->method.
        (push_it): Push it->image_id and it->method.  Push it->object
        instead of it->string if method is GET_FROM_IMAGE.
        (pop_it): Pop it->image_id and it->method.  Ppo it->object
        instead of it->string if method is GET_FROM_IMAGE.
        Reset it->current.string_pos if popped it->string is nil.
        (reseat_1): Remove comment dated 19 May 2003.  It expressed doubt
        whether a given change was correct; but the change is correct.
        Clear it->string_from_display_prop_p.
        (set_iterator_to_next): Rely on it->method and it->image_id from
        iterator stack, instead of setting them explicitly after pop_it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xdisp.c?cvsroot=emacs&r1=1.1102&r2=1.1103