[COMMIT] Don't override original compiled function documentation with aliases, doc.c

APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1527278921 -3600 # Fri May 25 21:08:41 2018 +0100 # Node ID 86932fba11e0bd9fe72b16d197a0e28fd6d7f54a # Parent edcd19fab0c4981fbb73c42048f90df3fdfbdc09 Don't override original compiled function documentation with aliases, doc.c src/ChangeLog addition: 2018-05-25 Aidan Kehoe <kehoea(a)parhasard.net&gt; * doc.c (Fsnarf_documentation): If the symbol being examined is an alias for a compiled function, and that compiled function already has documentation information, don't override that. diff -r edcd19fab0c4 -r 86932fba11e0 src/ChangeLog --- a/src/ChangeLog Fri May 25 13:50:46 2018 +0100 +++ b/src/ChangeLog Fri May 25 21:08:41 2018 +0100 ＠＠ -1,3 +1,10 ＠＠ +2018-05-25 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * doc.c (Fsnarf_documentation): + If the symbol being examined is an alias for a compiled function, + and that compiled function already has documentation information, + don't override that. + 2018-05-19 Aidan Kehoe <kehoea(a)parhasard.net&gt; Fix some leaks in the GTK code. diff -r edcd19fab0c4 -r 86932fba11e0 src/doc.c --- a/src/doc.c Fri May 25 13:50:46 2018 +0100 +++ b/src/doc.c Fri May 25 21:08:41 2018 +0100 ＠＠ -930,6 +930,15 ＠＠ not an int (a string, say) leave it alone. */ if (!FIXNUMP (old)) goto weird; + +#ifdef COMPILED_FUNCTION_ANNOTATION_HACK + if (!EQ (sym, compiled_function_annotation (f))) + { + /* We don't want to set the information for the + alias as the compiled function's details. */ + goto weird; + } +#endif } /* This may be a function or variable where we want -- ‘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)