Mercurial > emacs
diff src/nsterm.m @ 96812:eb46d3216494
apply fix from Chong Yidong to NS port ns_set_background_color(), and clean up comparison use of result from NS_FACE_BACKGROUND
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Sat, 19 Jul 2008 17:01:36 +0000 |
parents | 1e2f7aab70ba |
children | 6b7bbb1d9eb1 |
line wrap: on
line diff
--- a/src/nsterm.m Sat Jul 19 16:56:31 2008 +0000 +++ b/src/nsterm.m Sat Jul 19 17:01:36 2008 +0000 @@ -2692,7 +2692,7 @@ else face = FACE_FROM_ID (s->f, s->first_glyph->face_id); if (!face->stipple) - [(NS_FACE_BACKGROUND (face) != nil + [(NS_FACE_BACKGROUND (face) != 0 ? ns_lookup_indexed_color (NS_FACE_BACKGROUND (face), s->f) : FRAME_BACKGROUND_COLOR (s->f)) set]; else