Mercurial > emacs
changeset 68363:77c90a279caf
(handle_invisible_prop): Set it->position to fix cursor
display when point moves across an ellipsis. If there are
adjacent invisible texts, don't lose the second one's ellipsis.
(x_produce_glyphs): Doc fix.
| author | Károly Lőrentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 24 Jan 2006 07:59:23 +0000 |
| parents | 3b10b20b3387 |
| children | 8c8d4f7c9da5 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 31 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jan 23 23:16:58 2006 +0000 +++ b/src/ChangeLog Tue Jan 24 07:59:23 2006 +0000 @@ -1,3 +1,10 @@ +2006-01-24 L$,1 q(Brentey K,Aa(Broly <lorentey@elte.hu> + + * xdisp.c (handle_invisible_prop): Set it->position to fix cursor + display when point moves across an ellipsis. If there are + adjacent invisible texts, don't lose the second one's ellipsis. + (x_produce_glyphs): Doc fix. + 2006-01-23 Stefan Monnier <monnier@iro.umontreal.ca> * xterm.c (x_catch_errors_unwind): Yet another int/Lisp_Object mixup.
--- a/src/xdisp.c Mon Jan 23 23:16:58 2006 +0000 +++ b/src/xdisp.c Tue Jan 24 07:59:23 2006 +0000 @@ -3614,6 +3614,11 @@ skip starting with next_stop. */ if (invis_p) IT_CHARPOS (*it) = next_stop; + + /* If there are adjacent invisible texts, don't lose the + second one's ellipsis. */ + if (invis_p == 2) + display_ellipsis_p = 1; } while (invis_p); @@ -3634,7 +3639,23 @@ it->stack[it->sp - 1].display_ellipsis_p = display_ellipsis_p; } else if (display_ellipsis_p) - setup_for_ellipsis (it, 0); + { + /* Make sure that the glyphs of the ellipsis will get + correct `charpos' values. If we would not update + it->position here, the glyphs would belong to the + last visible character _before_ the invisible + text, which confuses `set_cursor_from_row'. + + We use the last invisible position instead of the + first because this way the cursor is always drawn on + the first "." of the ellipsis, whenever PT is inside + the invisible text. Otherwise the cursor would be + placed _after_ the ellipsis when the point is after the + first invisible character. */ + it->position.charpos = IT_CHARPOS (*it) - 1; + it->position.bytepos = CHAR_TO_BYTE (it->position.charpos); + setup_for_ellipsis (it, 0); + } } } @@ -19815,8 +19836,8 @@ /* RIF: Produce glyphs/get display metrics for the display element IT is - loaded with. See the description of struct display_iterator in - dispextern.h for an overview of struct display_iterator. */ + loaded with. See the description of struct it in dispextern.h + for an overview of struct it. */ void x_produce_glyphs (it)