[Emacs-diffs] /srv/bzr/emacs/trunk r109683: * xdisp.c (handle_invisible_prop): Make it a bit faster

[Paul Eggert]

------------------------------------------------------------
revno: 109683
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2012-08-19 12:22:41 -0700
message:
  * xdisp.c (handle_invisible_prop): Make it a bit faster
  
  and avoid a gcc -Wmaybe-uninitialized diagnostic.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-08-19 16:19:05 +0000
+++ b/src/ChangeLog     2012-08-19 19:22:41 +0000
@@ -1,3 +1,8 @@
+2012-08-19  Paul Eggert  <address@hidden>
+
+       * xdisp.c (handle_invisible_prop): Make it a bit faster
+       and avoid a gcc -Wmaybe-uninitialized diagnostic.
+
 2012-08-19  Chong Yidong  <address@hidden>
 
        * xdisp.c (handle_invisible_prop): Fix ellipses at overlay string

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-08-19 16:19:05 +0000
+++ b/src/xdisp.c       2012-08-19 19:22:41 +0000
@@ -4094,7 +4094,7 @@
 
          /* 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 @@
                    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;