# HG changeset patch # User Kenichi Handa # Date 1029725188 0 # Node ID 6c76daadf5306506bfebc1fd66902482a4408b2f # Parent 2de09ed6c85b248af04b9c68c09e7fee1c468a30 (COMPOSITION_MODIFICATION_FUNC): If PROP is not a cons, return Qnil. diff -r 2de09ed6c85b -r 6c76daadf530 src/composite.h --- a/src/composite.h Mon Aug 19 02:46:08 2002 +0000 +++ b/src/composite.h Mon Aug 19 02:46:28 2002 +0000 @@ -76,7 +76,7 @@ #define COMPOSITION_MODIFICATION_FUNC(prop) \ (COMPOSITION_REGISTERD_P (prop) \ ? XCDR (XCDR (XCDR (prop))) \ - : XCDR (prop)) + : CONSP (prop) ? XCDR (prop) : Qnil) /* Return the method of composition. */ #define COMPOSITION_METHOD(prop) \