/[emacs]/emacs/src/intervals.c
ViewVC logotype

Diff of /emacs/src/intervals.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.114 by walters, Sat Jun 8 20:25:17 2002 UTC revision 1.115 by monnier, Wed Jun 12 13:29:47 2002 UTC
# Line 1813  textget (plist, prop) Line 1813  textget (plist, prop)
1813       Lisp_Object plist;       Lisp_Object plist;
1814       register Lisp_Object prop;       register Lisp_Object prop;
1815  {  {
1816    lookup_char_property (plist, prop, 1);    return lookup_char_property (plist, prop, 1);
1817  }  }
1818    
1819  Lisp_Object  Lisp_Object
# Line 1824  lookup_char_property (plist, prop, textp Line 1824  lookup_char_property (plist, prop, textp
1824  {  {
1825    register Lisp_Object tail, fallback = Qnil;    register Lisp_Object tail, fallback = Qnil;
1826    
1827    for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))    for (tail = plist; CONSP (tail); tail = Fcdr (XCDR (tail)))
1828      {      {
1829        register Lisp_Object tem;        register Lisp_Object tem;
1830        tem = Fcar (tail);        tem = XCAR (tail);
1831        if (EQ (prop, tem))        if (EQ (prop, tem))
1832          return Fcar (Fcdr (tail));          return Fcar (XCDR (tail));
1833        if (EQ (tem, Qcategory))        if (EQ (tem, Qcategory))
1834          {          {
1835            tem = Fcar (Fcdr (tail));            tem = Fcar (XCDR (tail));
1836            if (SYMBOLP (tem))            if (SYMBOLP (tem))
1837              fallback = Fget (tem, prop);              fallback = Fget (tem, prop);
1838          }          }
# Line 1845  lookup_char_property (plist, prop, textp Line 1845  lookup_char_property (plist, prop, textp
1845    if (NILP (tail))    if (NILP (tail))
1846      return tail;      return tail;
1847    tail = XCDR (tail);    tail = XCDR (tail);
1848    for (; NILP (fallback) && !NILP (tail); tail = XCDR (tail))    for (; NILP (fallback) && CONSP (tail); tail = XCDR (tail))
1849      {      fallback = Fplist_get (plist, XCAR (tail));
       if (!CONSP (tail))  
         wrong_type_argument (Qlistp, tail);  
       fallback = Fplist_get (plist, XCAR (tail));  
     }  
1850    if (textprop && NILP (fallback) && CONSP (Vdefault_text_properties))    if (textprop && NILP (fallback) && CONSP (Vdefault_text_properties))
1851      fallback = Fplist_get (Vdefault_text_properties, prop);      fallback = Fplist_get (Vdefault_text_properties, prop);
1852    return fallback;    return fallback;

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.115

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26