changeset: 4377:751d82f59283dea703b660f3ebc3f3581e6d97d0 parent: 4374:4939bde48d124b27dc8fe1878a6d681f5a1fd24c user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Wed Jan 02 11:16:16 2008 +0100 files: src/ChangeLog src/doc.c description: Fix the union build--check that built-in macro function values are nil, not zero. 2008-01-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; * doc.c (Fbuilt_in_symbol_file): Don't check is fun zero in the condition, check that it's not nil. Fixes the union build; thank you Stephen. diff -r 4939bde48d124b27dc8fe1878a6d681f5a1fd24c -r 751d82f59283dea703b660f3ebc3f3581e6d97d0 src/ChangeLog --- a/src/ChangeLog Tue Jan 01 22:09:51 2008 -0800 +++ b/src/ChangeLog Wed Jan 02 11:16:16 2008 +0100 ＠＠ -1,3 +1,9 ＠＠ 2007-12-30 Aidan Kehoe <kehoea＠parhasa +2008-01-02 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * doc.c (Fbuilt_in_symbol_file): + Don't check is fun zero in the condition, check that it's not + nil. Fixes the union build; thank you Stephen. + 2007-12-30 Aidan Kehoe <kehoea(a)parhasard.net&gt; * doc.c (Fbuilt_in_symbol_file): diff -r 4939bde48d124b27dc8fe1878a6d681f5a1fd24c -r 751d82f59283dea703b660f3ebc3f3581e6d97d0 src/doc.c --- a/src/doc.c Tue Jan 01 22:09:51 2008 -0800 +++ b/src/doc.c Wed Jan 02 11:16:16 2008 +0100 ＠＠ -519,7 +519,7 ＠＠ If TYPE is `defvar', then variable defin fun = Findirect_function (symbol); if (SUBRP (fun) || (CONSP(fun) && (EQ (Qmacro, Fcar_safe (fun))) - && (fun = Fcdr_safe (fun)) + && !NILP(fun = Fcdr_safe (fun)) && (SUBRP (fun)))) { if (XSUBR (fun)->doc == 0) _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches