APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1514543126 0 # Fri Dec 29 10:25:26 2017 +0000 # Node ID 24f04bada33d560caea25b9f26471e885d17c1a9 # Parent 93eb43f8b6d24b760029efca495bd831aa270ebb Don't RETURN_UNGCPRO() a non-Lisp_Object value, output_string(). src/ChangeLog addition: 2017-12-29 Aidan Kehoe <kehoea(a)parhasard.net&gt; * print.c (output_string): Don't RETURN_UNGCPRO() a non-Lisp_Object value, thank you Jerry James. diff -r 93eb43f8b6d2 -r 24f04bada33d src/ChangeLog --- a/src/ChangeLog Fri Dec 29 10:15:56 2017 +0000 +++ b/src/ChangeLog Fri Dec 29 10:25:26 2017 +0000 ＠＠ -1,3 +1,9 ＠＠ +2017-12-29 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * print.c (output_string): + Don't RETURN_UNGCPRO() a non-Lisp_Object value, thank you Jerry + James. + 2017-12-29 Aidan Kehoe <kehoea(a)parhasard.net&gt; * process.c: diff -r 93eb43f8b6d2 -r 24f04bada33d src/print.c --- a/src/print.c Fri Dec 29 10:15:56 2017 +0000 +++ b/src/print.c Fri Dec 29 10:25:26 2017 +0000 ＠＠ -464,7 +464,8 ＠＠ if (print_unbuffered) Lstream_flush (XLSTREAM (function)); - RETURN_UNGCPRO (result); + UNGCPRO; + return result; } else if (BUFFERP (function)) { ＠＠ -476,7 +477,8 ＠＠ buffer_insert_string (XBUFFER (function), nonreloc, reloc, offset, len); - RETURN_UNGCPRO (len); + UNGCPRO; + return len; } else if (MARKERP (function)) { ＠＠ -490,7 +492,8 ＠＠ offset, len, -1, 0); set_byte_marker_position (function, byte_marker_position (function) + len); - RETURN_UNGCPRO (len); /* We will have errored on failure. */ + UNGCPRO; + return len; /* We will have errored on failure. */ } else if (FRAMEP (function)) { ＠＠ -507,7 +510,8 ＠＠ clear_echo_area_from_print (f, Qnil, 1); echo_area_append (f, nonreloc, reloc, offset, len, Vprint_message_label); - RETURN_UNGCPRO (len); + UNGCPRO; + return len; } else if (EQ (function, Qt) || EQ (function, Qnil)) { ＠＠ -557,7 +561,8 ＠＠ offset += itext_ichar_len (newnonreloc + offset); } - RETURN_UNGCPRO (len); + UNGCPRO; + return len; } }  -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)