[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/intervals.c
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/src/intervals.c |
Date: |
Wed, 12 Jun 2002 09:29:48 -0400 |
Index: emacs/src/intervals.c
diff -c emacs/src/intervals.c:1.114 emacs/src/intervals.c:1.115
*** emacs/src/intervals.c:1.114 Sat Jun 8 16:25:17 2002
--- emacs/src/intervals.c Wed Jun 12 09:29:47 2002
***************
*** 1813,1819 ****
Lisp_Object plist;
register Lisp_Object prop;
{
! lookup_char_property (plist, prop, 1);
}
Lisp_Object
--- 1813,1819 ----
Lisp_Object plist;
register Lisp_Object prop;
{
! return lookup_char_property (plist, prop, 1);
}
Lisp_Object
***************
*** 1824,1838 ****
{
register Lisp_Object tail, fallback = Qnil;
! for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
{
register Lisp_Object tem;
! tem = Fcar (tail);
if (EQ (prop, tem))
! return Fcar (Fcdr (tail));
if (EQ (tem, Qcategory))
{
! tem = Fcar (Fcdr (tail));
if (SYMBOLP (tem))
fallback = Fget (tem, prop);
}
--- 1824,1838 ----
{
register Lisp_Object tail, fallback = Qnil;
! for (tail = plist; CONSP (tail); tail = Fcdr (XCDR (tail)))
{
register Lisp_Object tem;
! tem = XCAR (tail);
if (EQ (prop, tem))
! return Fcar (XCDR (tail));
if (EQ (tem, Qcategory))
{
! tem = Fcar (XCDR (tail));
if (SYMBOLP (tem))
fallback = Fget (tem, prop);
}
***************
*** 1845,1856 ****
if (NILP (tail))
return tail;
tail = XCDR (tail);
! for (; NILP (fallback) && !NILP (tail); tail = XCDR (tail))
! {
! if (!CONSP (tail))
! wrong_type_argument (Qlistp, tail);
! fallback = Fplist_get (plist, XCAR (tail));
! }
if (textprop && NILP (fallback) && CONSP (Vdefault_text_properties))
fallback = Fplist_get (Vdefault_text_properties, prop);
return fallback;
--- 1845,1852 ----
if (NILP (tail))
return 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;