From 91b5390444faade507218117568ae5793b883efd Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 12 Jun 2002 13:29:55 +0000 Subject: [PATCH] (textget): Don't forget to `return'. (lookup_char_property): Use XCAR/XCDR. --- src/ChangeLog | 5 +++++ src/intervals.c | 18 +++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index be56c0aa6d4..82499da0a55 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-06-12 Stefan Monnier + + * intervals.c (textget): Don't forget to `return'. + (lookup_char_property): Use XCAR/XCDR. + 2002-06-12 Juanma Barranquero * xdisp.c (Fformat_mode_line): Fix typo. diff --git a/src/intervals.c b/src/intervals.c index 11a8eccfdfe..bec97d0b3e6 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1813,7 +1813,7 @@ textget (plist, prop) 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 @@ lookup_char_property (plist, prop, textprop) { 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 @@ lookup_char_property (plist, prop, textprop) 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; -- 2.11.4.GIT