(lookup_char_property): Do not prematurely return nil.

diff --git a/src/ChangeLog b/src/ChangeLog
index c1f0706b9280697a58d615dc09284f6d99d96b9b..61fc4bd2a86e8c96d58aab88b8522753638d3f6e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-20  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * intervals.c (lookup_char_property): Do not prematurely return nil.
+
 2004-05-19  Jim Blandy  <jimb@redhat.com>
 
        Add support for new '\_<' and '\_>' regexp operators, matching the

diff --git a/src/intervals.c b/src/intervals.c
index d3f814d60cecbe0faa32983dce147fed78219603..33ef9a3417740701322f05f05cedfd3205604535 100644 (file)
--- 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;