Mercurial > emacs
comparison src/fringe.c @ 91375:4bb19b57806d
Merge unicode branch
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1037
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 01 Feb 2008 16:01:31 +0000 |
| parents | 606f2d163a64 |
| children | 090cf85895a7 |
comparison
equal
deleted
inserted
replaced
| 88119:70ca9e418f5d | 91375:4bb19b57806d |
|---|---|
| 584 if (face_id == DEFAULT_FACE_ID) | 584 if (face_id == DEFAULT_FACE_ID) |
| 585 { | 585 { |
| 586 Lisp_Object face; | 586 Lisp_Object face; |
| 587 | 587 |
| 588 if ((face = fringe_faces[which], NILP (face)) | 588 if ((face = fringe_faces[which], NILP (face)) |
| 589 || (face_id = lookup_derived_face (f, face, 'A', FRINGE_FACE_ID, 0), | 589 || (face_id = lookup_derived_face (f, face, FRINGE_FACE_ID, 0), |
| 590 face_id < 0)) | 590 face_id < 0)) |
| 591 face_id = FRINGE_FACE_ID; | 591 face_id = FRINGE_FACE_ID; |
| 592 } | 592 } |
| 593 | 593 |
| 594 fb = fringe_bitmaps[which]; | 594 fb = fringe_bitmaps[which]; |
| 1561 error ("Undefined fringe bitmap"); | 1561 error ("Undefined fringe bitmap"); |
| 1562 | 1562 |
| 1563 if (!NILP (face)) | 1563 if (!NILP (face)) |
| 1564 { | 1564 { |
| 1565 face_id = lookup_derived_face (SELECTED_FRAME (), face, | 1565 face_id = lookup_derived_face (SELECTED_FRAME (), face, |
| 1566 'A', FRINGE_FACE_ID, 1); | 1566 FRINGE_FACE_ID, 1); |
| 1567 if (face_id < 0) | 1567 if (face_id < 0) |
| 1568 error ("No such face"); | 1568 error ("No such face"); |
| 1569 } | 1569 } |
| 1570 | 1570 |
| 1571 fringe_faces[n] = face; | 1571 fringe_faces[n] = face; |