Mercurial > hg > xemacs-beta

diff src/redisplay-msw.c @ 245:51092a27c943 r20-5b21

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b21
author cvs
date Mon, 13 Aug 2007 10:17:54 +0200
parents 41f2f0e326e9
children 83b3d10dcba9
line wrap: on
line diff
--- a/src/redisplay-msw.c	Mon Aug 13 10:17:09 2007 +0200
+++ b/src/redisplay-msw.c	Mon Aug 13 10:17:54 2007 +0200
@@ -220,7 +220,14 @@
       fprintf (stderr, "Help! mswindows_update_gc got a bogus fg value! fg = ");
       debug_print (fg);
       fg = Qnil;
-    }
+      }
+
+  if (!NILP (bg) && !COLOR_INSTANCEP (bg))
+    {
+      fprintf (stderr, "Help! mswindows_update_gc got a bogus fg value! bg = ");
+      debug_print (bg);
+      bg = Qnil;
+      }
 
   if (!NILP (fg))
     SetTextColor (hdc, COLOR_INSTANCE_MSWINDOWS_COLOR (XCOLOR_INSTANCE (fg)));
@@ -413,7 +420,7 @@
 		   int width, face_index findex)
 {
   struct frame *f = XFRAME (w->frame);
-  struct device *d = XDEVICE (f->device);
+  /* struct device *d = XDEVICE (f->device);*/
   Lisp_Object window = Qnil;
   HDC hdc;
   int clip_end;
@@ -457,7 +464,7 @@
   for (i = 0; i < nruns; i++)
     {
       Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset);
-      struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
+      /* struct Lisp_Font_Instance *fi = XFONT_INSTANCE (font);*/
       int this_width;
       RECT rect = { clip_start, dl->ypos - dl->ascent,
 		    clip_end, dl->ypos + dl->descent - dl->clip };
@@ -695,7 +702,7 @@
 
 /*****************************************************************************
  #### Display methods
-/*****************************************************************************
+*****************************************************************************/
 
 /*****************************************************************************
  mswindows_divider_width