Mercurial > emacs
changeset 107668:fd2cdc4e0e6a
* xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 24 Mar 2010 17:25:46 -0400 |
| parents | b6cc517c1044 |
| children | 1dc7dbba5184 27d7bc8db6b7 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 5 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Mar 24 12:18:13 2010 -0400 +++ b/src/ChangeLog Wed Mar 24 17:25:46 2010 -0400 @@ -1,3 +1,7 @@ +2010-03-24 Chong Yidong <cyd@stupidchicken.com> + + * xdisp.c (pos_visible_p): Revert 2008-01-25 change (Bug#5730). + 2010-03-20 Jan Djärv <jan.h.d@swipnet.se> * frame.c (x_get_arg): Handle RES_TYPE_BOOLEAN_NUMBER (bug #5736).
--- a/src/xdisp.c Wed Mar 24 12:18:13 2010 -0400 +++ b/src/xdisp.c Wed Mar 24 17:25:46 2010 -0400 @@ -1375,33 +1375,7 @@ visible_p = 1; if (visible_p) { - if (it_method == GET_FROM_BUFFER) - { - Lisp_Object window, prop; - - XSETWINDOW (window, w); - prop = Fget_char_property (make_number (charpos), - Qinvisible, window); - - /* If charpos coincides with invisible text covered with an - ellipsis, use the first glyph of the ellipsis to compute - the pixel positions. */ - if (TEXT_PROP_MEANS_INVISIBLE (prop) == 2) - { - struct glyph_row *row = it.glyph_row; - struct glyph *glyph = row->glyphs[TEXT_AREA]; - struct glyph *end = glyph + row->used[TEXT_AREA]; - int x = row->x; - - for (; glyph < end - && (!BUFFERP (glyph->object) - || glyph->charpos < charpos); - glyph++) - x += glyph->pixel_width; - top_x = x; - } - } - else if (it_method == GET_FROM_DISPLAY_VECTOR) + if (it_method == GET_FROM_DISPLAY_VECTOR) { /* We stopped on the last glyph of a display vector. Try and recompute. Hack alert! */