1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00

* xdisp.c (handle_invisible_prop): Make it a bit faster

and avoid a gcc -Wmaybe-uninitialized diagnostic.
This commit is contained in:
Paul Eggert 2012-08-19 12:22:41 -07:00
parent 7cef3569a3
commit 32bd425074
2 changed files with 8 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2012-08-19 Paul Eggert <eggert@cs.ucla.edu>
* xdisp.c (handle_invisible_prop): Make it a bit faster
and avoid a gcc -Wmaybe-uninitialized diagnostic.
2012-08-19 Chong Yidong <cyd@gnu.org>
* xdisp.c (handle_invisible_prop): Fix ellipses at overlay string

View file

@ -4094,7 +4094,7 @@ handle_invisible_prop (struct it *it)
/* Get the position at which the next visible text can be
found in IT->string, if any. */
len = SCHARS (it->string);
endpos = len = SCHARS (it->string);
XSETINT (limit, len);
do
{
@ -4109,12 +4109,12 @@ handle_invisible_prop (struct it *it)
display_ellipsis_p = 1;
}
}
while (invis_p && INTEGERP (end_charpos) && endpos < len);
while (invis_p && endpos < len);
if (display_ellipsis_p)
it->ellipsis_p = 1;
if (INTEGERP (end_charpos) && endpos < len)
if (endpos < len)
{
/* Text at END_CHARPOS is visible. Move IT there. */
struct text_pos old;