Mercurial > emacs
changeset 55707:7bb86df9311f
(lookup_char_property): Do not prematurely return nil.
| author | Luc Teirlinck <teirllm@auburn.edu> |
|---|---|
| date | Thu, 20 May 2004 17:29:57 +0000 |
| parents | f9ebf0f3d214 |
| children | 7be5e286a97a |
| files | src/intervals.c |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/intervals.c Thu May 20 16:59:22 2004 +0000 +++ b/src/intervals.c Thu May 20 17:29:57 2004 +0000 @@ -1899,11 +1899,13 @@ return fallback; /* Check for alternative properties */ tail = Fassq (prop, Vchar_property_alias_alist); - if (NILP (tail)) - return tail; - tail = XCDR (tail); - for (; NILP (fallback) && CONSP (tail); tail = XCDR (tail)) - fallback = Fplist_get (plist, XCAR (tail)); + if (! NILP (tail)) + { + tail = XCDR (tail); + for (; NILP (fallback) && CONSP (tail); tail = XCDR (tail)) + fallback = Fplist_get (plist, XCAR (tail)); + } + if (textprop && NILP (fallback) && CONSP (Vdefault_text_properties)) fallback = Fplist_get (Vdefault_text_properties, prop); return fallback;