[Emacs-diffs] /srv/bzr/emacs/trunk r109197: Fix display of tooltips damaged by enhancements for bug #11832.

[Eli Zaretskii]

------------------------------------------------------------
revno: 109197
fixes bug: http://debbugs.gnu.org/11832
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2012-07-24 19:34:15 +0300
message:
  Fix display of tooltips damaged by enhancements for bug #11832.
  
   src/xdisp.c (init_iterator): Don't compute dimensions of truncation
   and continuation glyphs on tooltip frames, leave them at zero.
   Avoids displaying continued lines in tooltips.
modified:
  src/ChangeLog
  src/xdisp.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-24 06:45:44 +0000
+++ b/src/ChangeLog     2012-07-24 16:34:15 +0000
@@ -1,3 +1,9 @@
+2012-07-24  Eli Zaretskii  <address@hidden>
+
+       * xdisp.c (init_iterator): Don't compute dimensions of truncation
+       and continuation glyphs on tooltip frames, leave them at zero.
+       Avoids continued lines in tooltips.  (Bug#11832)
+
 2012-07-24  Dmitry Antipov  <address@hidden>
 
        Simplify copy_overlay.

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2012-07-13 10:11:37 +0000
+++ b/src/xdisp.c       2012-07-24 16:34:15 +0000
@@ -2733,20 +2733,25 @@
 
   /* Get dimensions of truncation and continuation glyphs.  These are
      displayed as fringe bitmaps under X, but we need them for such
-     frames when the fringes are turned off.  */
-  if (it->line_wrap == TRUNCATE)
-    {
-      /* We will need the truncation glyph.  */
-      eassert (it->glyph_row == NULL);
-      produce_special_glyphs (it, IT_TRUNCATION);
-      it->truncation_pixel_width = it->pixel_width;
-    }
-  else
-    {
-      /* We will need the continuation glyph.  */
-      eassert (it->glyph_row == NULL);
-      produce_special_glyphs (it, IT_CONTINUATION);
-      it->continuation_pixel_width = it->pixel_width;
+     frames when the fringes are turned off.  But leave the dimensions
+     zero for tooltip frames, as these glyphs look ugly there and also
+     sabotage calculations of tooltip dimensions in x-show-tip.  */
+  if (!(FRAMEP (tip_frame) && it->f == XFRAME (tip_frame)))
+    {
+      if (it->line_wrap == TRUNCATE)
+       {
+         /* We will need the truncation glyph.  */
+         eassert (it->glyph_row == NULL);
+         produce_special_glyphs (it, IT_TRUNCATION);
+         it->truncation_pixel_width = it->pixel_width;
+       }
+      else
+       {
+         /* We will need the continuation glyph.  */
+         eassert (it->glyph_row == NULL);
+         produce_special_glyphs (it, IT_CONTINUATION);
+         it->continuation_pixel_width = it->pixel_width;
+       }
     }
 
   /* Reset these values to zero because the produce_special_glyphs