diff options
| author | Andreas Schwab <[email protected]> | 2004-02-19 11:11:39 +0000 |
|---|---|---|
| committer | Andreas Schwab <[email protected]> | 2004-02-19 11:11:39 +0000 |
| commit | beaedd56201d7d2201256186493acf426edc59c9 (patch) | |
| tree | 99d9ccb9111393e2adbaacc1f0e4392bacdf1236 /src/fringe.c | |
| parent | abc178a0bcbf63f5646284f78f5fd29e4fc04e2e (diff) | |
(Fdefine_fringe_bitmap): Use && instead of & to avoid
warning.
Diffstat (limited to 'src/fringe.c')
| -rw-r--r-- | src/fringe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fringe.c b/src/fringe.c index bccd0472b2..ba4fbfdc7e 100644 --- a/src/fringe.c +++ b/src/fringe.c @@ -1189,9 +1189,9 @@ Return new bitmap number, or nil of no more free bitmap slots. */) 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 @@ Return new bitmap number, or nil of no more free bitmap slots. */) { 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; |