comparison src/intervals.c @ 10927:7d02d12082ff

(textget): Check default_properties vbl too.
author Boris Goldowsky <boris@gnu.org>
date Mon, 06 Mar 1995 15:43:56 +0000
parents d35f5eca6dd5
children 119880025e8f
comparison
equal deleted inserted replaced
10926:66bf8ed1727b 10927:7d02d12082ff
1541 return; 1541 return;
1542 } 1542 }
1543 1543
1544 /* Get the value of property PROP from PLIST, 1544 /* Get the value of property PROP from PLIST,
1545 which is the plist of an interval. 1545 which is the plist of an interval.
1546 We check for direct properties and for categories with property PROP. */ 1546 We check for direct properties, for categories with property PROP,
1547 and for PROP appearing on the default-properties list. */
1547 1548
1548 Lisp_Object 1549 Lisp_Object
1549 textget (plist, prop) 1550 textget (plist, prop)
1550 Lisp_Object plist; 1551 Lisp_Object plist;
1551 register Lisp_Object prop; 1552 register Lisp_Object prop;
1565 if (SYMBOLP (tem)) 1566 if (SYMBOLP (tem))
1566 fallback = Fget (tem, prop); 1567 fallback = Fget (tem, prop);
1567 } 1568 }
1568 } 1569 }
1569 1570
1570 return fallback; 1571 if (! NILP (fallback))
1572 return fallback;
1573 if (CONSP (Vdefault_properties))
1574 return textget_direct (Vdefault_properties, prop);
1575 return Qnil;
1571 } 1576 }
1572 1577
1573 /* Get the value of property PROP from PLIST, 1578 /* Get the value of property PROP from PLIST,
1574 which is the plist of an interval. 1579 which is the plist of an interval.
1575 We check for direct properties only! */ 1580 We check for direct properties only! */