From: Boris Goldowsky <boris@gnu.org>
Date: Mon, 6 Mar 1995 15:43:56 +0000 (+0000)
Subject: (textget): Check default_properties vbl too.
X-Git-Tag: emacs-19.34~4931
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70743ff1170222cecf36bb5533853ace0526635e;p=emacs.git

(textget): Check default_properties vbl too.
---

diff --git a/src/intervals.c b/src/intervals.c
index 6e88be19cc7..d444cc11a59 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1543,7 +1543,8 @@ graft_intervals_into_buffer (source, position, length, buffer, inherit)
 
 /* Get the value of property PROP from PLIST,
    which is the plist of an interval.
-   We check for direct properties and for categories with property PROP.  */
+   We check for direct properties, for categories with property PROP, 
+   and for PROP appearing on the default-properties list.  */
 
 Lisp_Object
 textget (plist, prop)
@@ -1567,7 +1568,11 @@ textget (plist, prop)
 	}
     }
 
-  return fallback;
+  if (! NILP (fallback))
+    return fallback;
+  if (CONSP (Vdefault_properties))
+    return textget_direct (Vdefault_properties, prop);
+  return Qnil;
 }
 
 /* Get the value of property PROP from PLIST,