# HG changeset patch # User Sam Steingold # Date 1076352584 0 # Node ID ff3a4c68034757d8403d290bc40a041c565d5eba # Parent d85f8f2e71f71be3225d5af2dd30fc8bdf22341e (w32_draw_fringe_bitmap): Fixed a typo in the last patch. diff -r d85f8f2e71f7 -r ff3a4c680347 src/ChangeLog --- a/src/ChangeLog Mon Feb 09 15:39:49 2004 +0000 +++ b/src/ChangeLog Mon Feb 09 18:49:44 2004 +0000 @@ -1,3 +1,7 @@ +2004-02-09 Sam Steingold + + * w32term.c (w32_draw_fringe_bitmap): Fixed a typo in the last patch. + 2004-02-09 Kim F. Storm * 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 -r d85f8f2e71f7 -r ff3a4c680347 src/w32term.c --- a/src/w32term.c Mon Feb 09 15:39:49 2004 +0000 +++ b/src/w32term.c Mon Feb 09 18:49:44 2004 +0000 @@ -698,7 +698,7 @@ 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 @@ 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