Mercurial > emacs
changeset 45781:d65729232269
(textget): Don't forget to `return'.
(lookup_char_property): Use XCAR/XCDR.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 12 Jun 2002 13:29:47 +0000 |
| parents | d850bd75235f |
| children | 0f8d5bf36f62 |
| files | src/intervals.c |
| diffstat | 1 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/intervals.c Wed Jun 12 13:10:00 2002 +0000 +++ b/src/intervals.c Wed Jun 12 13:29:47 2002 +0000 @@ -1813,7 +1813,7 @@ Lisp_Object plist; register Lisp_Object prop; { - lookup_char_property (plist, prop, 1); + return lookup_char_property (plist, prop, 1); } Lisp_Object @@ -1824,15 +1824,15 @@ { register Lisp_Object tail, fallback = Qnil; - for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail))) + for (tail = plist; CONSP (tail); tail = Fcdr (XCDR (tail))) { register Lisp_Object tem; - tem = Fcar (tail); + tem = XCAR (tail); if (EQ (prop, tem)) - return Fcar (Fcdr (tail)); + return Fcar (XCDR (tail)); if (EQ (tem, Qcategory)) { - tem = Fcar (Fcdr (tail)); + tem = Fcar (XCDR (tail)); if (SYMBOLP (tem)) fallback = Fget (tem, prop); } @@ -1845,12 +1845,8 @@ 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)); - } + 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;