[Emacs-diffs] Changes to emacs/src/xdisp.c,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/09/10 00:10:46

Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1119
retrieving revision 1.1120
diff -u -b -r1.1119 -r1.1120
--- xdisp.c     8 Sep 2006 14:14:28 -0000       1.1119
+++ xdisp.c     10 Sep 2006 00:10:46 -0000      1.1120
@@ -21248,14 +21248,16 @@
          if (cursor_type == FILLED_BOX_CURSOR)
            {
              /* Using a block cursor on large images can be very annoying.
-                So use a hollow cursor for "large" images.  */
+                So use a hollow cursor for "large" images.
+                If image is not transparent (no mask), also use hollow cursor. 
 */
              struct image *img = IMAGE_FROM_ID (f, glyph->u.img_id);
              if (img != NULL && IMAGEP (img->spec))
                {
                  /* Arbitrarily, interpret "Large" as >32x32 and >NxN
                     where N = size of default frame font size.
                     This should cover most of the "tiny" icons people may use. 
 */
-                 if (img->width > max (32, WINDOW_FRAME_COLUMN_WIDTH (w))
+                 if (!img->mask
+                     || img->width > max (32, WINDOW_FRAME_COLUMN_WIDTH (w))
                      || img->height > max (32, WINDOW_FRAME_LINE_HEIGHT (w)))
                    cursor_type = HOLLOW_BOX_CURSOR;
                }