comparison src/symbols.c @ 4969:cbe181529c34

Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents e813cf16c015 ba353d7b0ce8
children bcdf496e49d0
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
52 objects. This ought to be cleaned up. */ 52 objects. This ought to be cleaned up. */
53 53
54 #include <config.h> 54 #include <config.h>
55 #include "lisp.h" 55 #include "lisp.h"
56 56
57 #include "bytecode.h" /* for COMPILED_FUNCTION_ANNOTATION_HACK,
58 defined in bytecode.h and used here. */
57 #include "buffer.h" /* for Vbuffer_defaults */ 59 #include "buffer.h" /* for Vbuffer_defaults */
58 #include "console-impl.h" 60 #include "console-impl.h"
59 #include "elhash.h" 61 #include "elhash.h"
60 62
61 Lisp_Object Qad_advice_info, Qad_activate; 63 Lisp_Object Qad_advice_info, Qad_activate;
714 716
715 /* FSFmacs */ 717 /* FSFmacs */
716 DEFUN ("define-function", Fdefine_function, 2, 2, 0, /* 718 DEFUN ("define-function", Fdefine_function, 2, 2, 0, /*
717 Set SYMBOL's function definition to NEWDEF, and return NEWDEF. 719 Set SYMBOL's function definition to NEWDEF, and return NEWDEF.
718 Associates the function with the current load file, if any. 720 Associates the function with the current load file, if any.
721 If NEWDEF is a compiled-function object, stores the function name in
722 the `annotated' slot of the compiled-function (retrievable using
723 `compiled-function-annotation').
719 */ 724 */
720 (symbol, newdef)) 725 (symbol, newdef))
721 { 726 {
722 /* This function can GC */ 727 /* This function can GC */
723 Ffset (symbol, newdef); 728 Ffset (symbol, newdef);
724 LOADHIST_ATTACH (Fcons (Qdefun, symbol)); 729 LOADHIST_ATTACH (Fcons (Qdefun, symbol));
730 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
731 if (COMPILED_FUNCTIONP (newdef))
732 XCOMPILED_FUNCTION (newdef)->annotated = symbol;
733 #endif /* COMPILED_FUNCTION_ANNOTATION_HACK */
725 return newdef; 734 return newdef;
726 } 735 }
727 736
728 DEFUN ("subr-name", Fsubr_name, 1, 1, 0, /* 737 DEFUN ("subr-name", Fsubr_name, 1, 1, 0, /*
729 Return name of function SUBR. 738 Return name of function SUBR.