Mercurial > emacs
comparison src/fringe.c @ 59581:26fb5a3f95ac
* fringe.c (Fdefine_fringe_bitmap, init_fringe): When assigning
fringe_faces, cast result from xmalloc/xrealloc to Lisp_Object *.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Sun, 16 Jan 2005 09:59:03 +0000 |
| parents | 8f5e8e079790 |
| children | 94900ab8eef0 3dcba0bc766b 6d92d69fae33 |
comparison
equal
deleted
inserted
replaced
| 59580:f43d0816e9c3 | 59581:26fb5a3f95ac |
|---|---|
| 1299 max_fringe_bitmaps += 20; | 1299 max_fringe_bitmaps += 20; |
| 1300 fringe_bitmaps | 1300 fringe_bitmaps |
| 1301 = ((struct fringe_bitmap **) | 1301 = ((struct fringe_bitmap **) |
| 1302 xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *))); | 1302 xrealloc (fringe_bitmaps, max_fringe_bitmaps * sizeof (struct fringe_bitmap *))); |
| 1303 fringe_faces | 1303 fringe_faces |
| 1304 = (unsigned *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object)); | 1304 = (Lisp_Object *) xrealloc (fringe_faces, max_fringe_bitmaps * sizeof (Lisp_Object)); |
| 1305 | 1305 |
| 1306 for (; i < max_fringe_bitmaps; i++) | 1306 for (; i < max_fringe_bitmaps; i++) |
| 1307 { | 1307 { |
| 1308 fringe_bitmaps[i] = NULL; | 1308 fringe_bitmaps[i] = NULL; |
| 1309 fringe_faces[i] = Qnil; | 1309 fringe_faces[i] = Qnil; |
| 1470 max_fringe_bitmaps = MAX_STANDARD_FRINGE_BITMAPS + 20; | 1470 max_fringe_bitmaps = MAX_STANDARD_FRINGE_BITMAPS + 20; |
| 1471 | 1471 |
| 1472 fringe_bitmaps | 1472 fringe_bitmaps |
| 1473 = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *)); | 1473 = (struct fringe_bitmap **) xmalloc (max_fringe_bitmaps * sizeof (struct fringe_bitmap *)); |
| 1474 fringe_faces | 1474 fringe_faces |
| 1475 = (unsigned *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object)); | 1475 = (Lisp_Object *) xmalloc (max_fringe_bitmaps * sizeof (Lisp_Object)); |
| 1476 | 1476 |
| 1477 for (i = 0; i < max_fringe_bitmaps; i++) | 1477 for (i = 0; i < max_fringe_bitmaps; i++) |
| 1478 { | 1478 { |
| 1479 fringe_bitmaps[i] = NULL; | 1479 fringe_bitmaps[i] = NULL; |
| 1480 fringe_faces[i] = Qnil; | 1480 fringe_faces[i] = Qnil; |