changeset: 5394:484b437fc7b4 tag: tip user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Mon Apr 04 09:12:39 2011 +0100 files: src/ChangeLog src/fns.c description: Correct some nesting of GCPRO and UNGCPRO, thank you Mats' buildbot! 2011-04-04 Aidan Kehoe <kehoea(a)parhasard.net&gt; * fns.c (FremoveX): * fns.c (sublis): Correct some nesting of GCPRO and UNGCPRO here, revealed by the the C++ build compiling core Lisp. Thank you Mats' buildbot! diff -r e99b473303e3 -r 484b437fc7b4 src/ChangeLog --- a/src/ChangeLog Mon Apr 04 00:20:09 2011 +0100 +++ b/src/ChangeLog Mon Apr 04 09:12:39 2011 +0100 ＠＠ -1,3 +1,10 ＠＠ +2011-04-04 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * fns.c (FremoveX): + * fns.c (sublis): + Correct some nesting of GCPRO and UNGCPRO here, revealed by the + the C++ build compiling core Lisp. Thank you Mats' buildbot! + 2011-04-04 Aidan Kehoe <kehoea(a)parhasard.net&gt; * lisp.h (GC_EXTERNAL_LIST_LOOP_3, GC_EXTERNAL_LIST_LOOP_4): New. diff -r e99b473303e3 -r 484b437fc7b4 src/fns.c --- a/src/fns.c Mon Apr 04 00:20:09 2011 +0100 +++ b/src/fns.c Mon Apr 04 09:12:39 2011 +0100 ＠＠ -3658,6 +3658,7 ＠＠ if (EQ (tail, tailing)) { XUNGCPRO (elt); + UNGCPRO; if (NILP (result)) { ＠＠ -9147,7 +9148,7 ＠＠ if (!CONSP (tree)) { - RETURN_UNGCPRO (tree); + return tree; } aa = sublis (alist, XCAR (tree), check_test, test_not_unboundp, test, key, ＠＠ -9157,10 +9158,10 ＠＠ if (EQ (aa, XCAR (tree)) && EQ (dd, XCDR (tree))) { - RETURN_UNGCPRO (tree); - } - - RETURN_UNGCPRO (Fcons (aa, dd)); + return tree; + } + + return Fcons (aa, dd); } DEFUN ("sublis", Fsublis, 2, MANY, 0, /* _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches