Mercurial > emacs
comparison src/font.c @ 94964:5ffc88767cc1
(font_prop_validate): Make nil a valid value.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 14 May 2008 10:38:27 +0000 |
| parents | 8971ddf55736 |
| children | e87ef440216b |
comparison
equal
deleted
inserted
replaced
| 94963:8971ddf55736 | 94964:5ffc88767cc1 |
|---|---|
| 564 int idx; | 564 int idx; |
| 565 Lisp_Object prop, val; | 565 Lisp_Object prop, val; |
| 566 { | 566 { |
| 567 Lisp_Object validated; | 567 Lisp_Object validated; |
| 568 | 568 |
| 569 if (NILP (val)) | |
| 570 return val; | |
| 569 if (NILP (prop)) | 571 if (NILP (prop)) |
| 570 prop = *font_property_table[idx].key; | 572 prop = *font_property_table[idx].key; |
| 571 else | 573 else |
| 572 { | 574 { |
| 573 idx = get_font_prop_index (prop); | 575 idx = get_font_prop_index (prop); |