Mercurial > emacs
changeset 54079:e1b6171f91b8
(Fdefine_fringe_bitmap): Use && instead of & to avoid
warning.
| author | Andreas Schwab <schwab@suse.de> |
|---|---|
| date | Thu, 19 Feb 2004 11:11:39 +0000 |
| parents | eeaae818026b |
| children | 3e751a748427 |
| files | src/fringe.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fringe.c Thu Feb 19 01:20:03 2004 +0000 +++ b/src/fringe.c Thu Feb 19 11:11:39 2004 +0000 @@ -1189,9 +1189,9 @@ fb.dynamic = 1; - xfb = (struct fringe_bitmap *)xmalloc (sizeof fb - + fb.height * BYTES_PER_BITMAP_ROW); - fb.bits = b = (unsigned short *)(xfb+1); + xfb = (struct fringe_bitmap *) xmalloc (sizeof fb + + fb.height * BYTES_PER_BITMAP_ROW); + fb.bits = b = (unsigned short *) (xfb + 1); bzero (b, fb.height); j = 0; @@ -1199,7 +1199,7 @@ { for (i = 0; i < fill1 && j < fb.height; i++) b[j++] = 0; - for (i = 0; i < h & j < fb.height; i++) + for (i = 0; i < h && j < fb.height; i++) { Lisp_Object elt = Faref (bits, make_number (i)); b[j++] = NUMBERP (elt) ? XINT (elt) : 0;