(w32_draw_fringe_bitmap): Fixed a typo in the last patch.

diff --git a/src/ChangeLog b/src/ChangeLog
index af9d956cf9e9668f129702fea4dffb8ebcf734b6..6332c1267bfb105d3086135646503196d35331d1 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-09  Sam Steingold  <sds@gnu.org>
+
+       * w32term.c (w32_draw_fringe_bitmap): Fixed a typo in the last patch.
+
 2004-02-09  Kim F. Storm  <storm@cua.dk>
 
        * fringe.c: New file.  Move original fringe related declarations
@@ -28,7 +32,7 @@
        DEFVAR_LISP Voverflow_newline_into_fringe.
        (init_fringe_once, init_fringe): New functions.
        (w32_init_fringe, w32_reset_fringes) [WINDOWS_NT]: New functions.
-       
+
        * Makefile.in (obj): Add fringe.o.
        (fringe.o): New dependencies.
 

diff --git a/src/w32term.c b/src/w32term.c
index 239bc659f0ba0ef2692f0455eaa6c3a1efa71bbb..4d1006e9c192d3b7c3c1fa3513619c0650bff3dc 100644 (file)
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -698,7 +698,7 @@ w32_draw_fringe_bitmap (w, row, p)
   else
     w32_clip_to_row (w, row, hdc);
 
-  if (p->bx >= 0 !p->overlay_p)
+  if (p->bx >= 0 && !p->overlay_p)
     {
       w32_fill_area (f, hdc, face->background,
                     p->bx, p->by, p->nx, p->ny);
@@ -725,13 +725,13 @@ w32_draw_fringe_bitmap (w, row, p)
 
       if (p->overlay_p)
        {
-         clipmask = XCreatePixmapFromBitmapData (display, 
+         clipmask = XCreatePixmapFromBitmapData (display,
                                                  FRAME_X_DISPLAY_INFO (f)->root_window,
-                                                 bits, p->wd, p->h, 
+                                                 bits, p->wd, p->h,
                                                  1, 0, 1);
          gcv.clip_mask = clipmask;
          gcv.clip_x_origin = p->x;
-         gcv.clip_y_origin = p->y; 
+         gcv.clip_y_origin = p->y;
          XChangeGC (display, gc, GCClipMask | GCClipXOrigin | GCClipYOrigin, &gcv);
        }
 #endif