Mercurial > emacs

changeset 11133:119880025e8f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(Vdefault_text_properties): name changed from Vdefault_properties. (textget_direct): Fn deleted. (textget, verify_interval_modification): Use Fplist_get instead.
author Boris Goldowsky <boris@gnu.org>
date Mon, 27 Mar 1995 16:05:57 +0000
parents e4770cb46861
children 6f4c5a47520e
files src/intervals.c
diffstat 1 files changed, 7 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/src/intervals.c	Mon Mar 27 16:05:28 1995 +0000
+++ b/src/intervals.c	Mon Mar 27 16:05:57 1995 +0000
@@ -1544,7 +1544,7 @@
 /* Get the value of property PROP from PLIST,
    which is the plist of an interval.
    We check for direct properties, for categories with property PROP, 
-   and for PROP appearing on the default-properties list.  */
+   and for PROP appearing on the default-text-properties list.  */
 
 Lisp_Object
 textget (plist, prop)
@@ -1570,30 +1570,11 @@
 
   if (! NILP (fallback))
     return fallback;
-  if (CONSP (Vdefault_properties))
-    return textget_direct (Vdefault_properties, prop);
+  if (CONSP (Vdefault_text_properties))
+    return Fplist_get (Vdefault_text_properties, prop);
   return Qnil;
 }
 
-/* Get the value of property PROP from PLIST,
-   which is the plist of an interval.
-   We check for direct properties only! */
-
-Lisp_Object
-textget_direct (plist, prop)
-     Lisp_Object plist;
-     register Lisp_Object prop;
-{
-  register Lisp_Object tail;
-
-  for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
-    {
-      if (EQ (prop, Fcar (tail)))
-	return Fcar (Fcdr (tail));
-    }
-
-  return Qnil;
-}
 
 /* Set point in BUFFER to POSITION.  If the target position is 
    before an intangible character, move to an ok place.  */
@@ -1890,7 +1871,7 @@
 
 		      tem = textget (i->plist, Qfront_sticky);
 		      if (TMEM (Qread_only, tem)
-			  || (NILP (textget_direct (i->plist, Qread_only))
+			  || (NILP (Fplist_get (i->plist, Qread_only))
 			      && TMEM (Qcategory, tem)))
 			error ("Attempt to insert within read-only text");
 		    }
@@ -1910,7 +1891,7 @@
 
 		      tem = textget (prev->plist, Qrear_nonsticky);
 		      if (! TMEM (Qread_only, tem)
-			  && (! NILP (textget_direct (prev->plist,Qread_only))
+			  && (! NILP (Fplist_get (prev->plist,Qread_only))
 			      || ! TMEM (Qcategory, tem)))
 			error ("Attempt to insert within read-only text");
 		    }
@@ -1929,13 +1910,13 @@
 
 		  tem = textget (i->plist, Qfront_sticky);
 		  if (TMEM (Qread_only, tem)
-		      || (NILP (textget_direct (i->plist, Qread_only))
+		      || (NILP (Fplist_get (i->plist, Qread_only))
 			  && TMEM (Qcategory, tem)))
 		    error ("Attempt to insert within read-only text");
 
 		  tem = textget (prev->plist, Qrear_nonsticky);
 		  if (! TMEM (Qread_only, tem)
-		      && (! NILP (textget_direct (prev->plist, Qread_only))
+		      && (! NILP (Fplist_get (prev->plist, Qread_only))
 			  || ! TMEM (Qcategory, tem)))
 		    error ("Attempt to insert within read-only text");
 		}