[Emacs-diffs] /srv/bzr/emacs/trunk r105808: Fix bug #9530 with incorrect display of zero-width stretch.

[Eli Zaretskii]

------------------------------------------------------------
revno: 105808
fixes bug(s): http://debbugs.gnu.org/9530
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-17 21:21:24 +0300
message:
  Fix bug #9530 with incorrect display of zero-width stretch.
  
   src/xdisp.c (produce_stretch_glyph): Another fix for changes made on
   2011-08-30 (revision 105619).
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-17 15:18:56 +0000
+++ b/src/ChangeLog     2011-09-17 18:21:24 +0000
@@ -1,5 +1,10 @@
 2011-09-17  Eli Zaretskii  <address@hidden>
 
+       * xdisp.c (produce_stretch_glyph): Another fix for changes made on
+       2011-08-30 (revision 105619).  (Bug#9530)
+
+2011-09-17  Eli Zaretskii  <address@hidden>
+
        * xdisp.c (reseat_at_next_visible_line_start): Keep information
        about the current paragraph and restore it after the call to
        reseat.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2011-09-17 15:18:56 +0000
+++ b/src/xdisp.c       2011-09-17 18:21:24 +0000
@@ -23298,14 +23298,7 @@
        object = it->w->buffer;
 #ifdef HAVE_WINDOW_SYSTEM
       if (FRAME_WINDOW_P (it->f))
-       {
-         append_stretch_glyph (it, object, width, height, ascent);
-         it->pixel_width = width;
-         it->ascent = it->phys_ascent = ascent;
-         it->descent = it->phys_descent = height - it->ascent;
-         it->nglyphs = width > 0 && height > 0 ? 1 : 0;
-         take_vertical_position_into_account (it);
-       }
+       append_stretch_glyph (it, object, width, height, ascent);
       else
 #endif
        {
@@ -23317,6 +23310,19 @@
          it->object = o_object;
        }
     }
+
+  it->pixel_width = width;
+#ifdef HAVE_WINDOW_SYSTEM
+  if (FRAME_WINDOW_P (it->f))
+    {
+      it->ascent = it->phys_ascent = ascent;
+      it->descent = it->phys_descent = height - it->ascent;
+      it->nglyphs = width > 0 && height > 0 ? 1 : 0;
+      take_vertical_position_into_account (it);
+    }
+  else
+#endif
+    it->nglyphs = width;
 }
 
 #ifdef HAVE_WINDOW_SYSTEM