comparison src/alloc.c @ 4969:cbe181529c34

Automatic merge
author Ben Wing <ben@xemacs.org>
date Wed, 03 Feb 2010 21:46:21 -0600
parents 1f509f82c8c9 8ee3c10d1ed5
children 16112448d484
comparison
equal deleted inserted replaced
4968:4d35e52790f8 4969:cbe181529c34
1928 1928
1929 CHECK_NATNUM (stack_depth); 1929 CHECK_NATNUM (stack_depth);
1930 f->stack_depth = (unsigned short) XINT (stack_depth); 1930 f->stack_depth = (unsigned short) XINT (stack_depth);
1931 1931
1932 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK 1932 #ifdef COMPILED_FUNCTION_ANNOTATION_HACK
1933 if (!NILP (Vcurrent_compiled_function_annotation)) 1933 f->annotated = Vload_file_name_internal;
1934 f->annotated = Fcopy (Vcurrent_compiled_function_annotation);
1935 else if (!NILP (Vload_file_name_internal_the_purecopy))
1936 f->annotated = Vload_file_name_internal_the_purecopy;
1937 else if (!NILP (Vload_file_name_internal))
1938 {
1939 struct gcpro gcpro1;
1940 GCPRO1 (fun); /* don't let fun get reaped */
1941 Vload_file_name_internal_the_purecopy =
1942 Ffile_name_nondirectory (Vload_file_name_internal);
1943 f->annotated = Vload_file_name_internal_the_purecopy;
1944 UNGCPRO;
1945 }
1946 #endif /* COMPILED_FUNCTION_ANNOTATION_HACK */ 1934 #endif /* COMPILED_FUNCTION_ANNOTATION_HACK */
1947 1935
1948 /* doc_string may be nil, string, int, or a cons (string . int). 1936 /* doc_string may be nil, string, int, or a cons (string . int).
1949 interactive may be list or string (or unbound). */ 1937 interactive may be list or string (or unbound). */
1950 f->doc_and_interactive = Qunbound; 1938 f->doc_and_interactive = Qunbound;