diff options
author | Luc Teirlinck <teirllm@auburn.edu> | 2004-05-20 17:29:57 +0000 |
---|---|---|
committer | Luc Teirlinck <teirllm@auburn.edu> | 2004-05-20 17:29:57 +0000 |
commit | 4c8d59cc5db61144352fd9829ffe9df72c4c70e4 (patch) | |
tree | 45754d40f1d8b58ae9a12511aea6657c2dc8a784 /src/intervals.c | |
parent | 63512e13d8b3266fe68b1ddeb1d40f6452194391 (diff) | |
download | emacs-4c8d59cc5db61144352fd9829ffe9df72c4c70e4.tar.gz |
(lookup_char_property): Do not prematurely return nil.
Diffstat (limited to 'src/intervals.c')
-rw-r--r-- | src/intervals.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/intervals.c b/src/intervals.c index d3f814d60ce..33ef9a34177 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1899,11 +1899,13 @@ lookup_char_property (plist, prop, textprop) 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; |