# HG changeset patch # User Luc Teirlinck # Date 1085074197 0 # Node ID 7bb86df9311faa55c991902e56c77f937d68aa92 # Parent f9ebf0f3d214f8823d732e51c032afd6bca79b00 (lookup_char_property): Do not prematurely return nil. diff -r f9ebf0f3d214 -r 7bb86df9311f src/intervals.c --- 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;