aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/alloc.c1
-rw-r--r--src/lisp.h1
3 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index a5a4657f7dc..00361255651 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12011-03-16 Paul Eggert <eggert@cs.ucla.edu> 12011-03-16 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * alloc.c (mark_backtrace): Move decl from here ...
4 * lisp.h: ... to here, so that it can be checked.
5
3 * eval.c (call_debugger, do_debug_on_call, grow_specpdl): Now static. 6 * eval.c (call_debugger, do_debug_on_call, grow_specpdl): Now static.
4 (Fdefvar): Rewrite so as not to use empty "else". 7 (Fdefvar): Rewrite so as not to use empty "else".
5 (lisp_indirect_variable): Name an expression, 8 (lisp_indirect_variable): Name an expression,
diff --git a/src/alloc.c b/src/alloc.c
index 6262e002ed3..66695e7a9bc 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -270,7 +270,6 @@ Lisp_Object Qpost_gc_hook;
270 270
271static void mark_buffer (Lisp_Object); 271static void mark_buffer (Lisp_Object);
272static void mark_terminals (void); 272static void mark_terminals (void);
273extern void mark_backtrace (void);
274static void gc_sweep (void); 273static void gc_sweep (void);
275static void mark_glyph_matrix (struct glyph_matrix *); 274static void mark_glyph_matrix (struct glyph_matrix *);
276static void mark_face_cache (struct face_cache *); 275static void mark_face_cache (struct face_cache *);
diff --git a/src/lisp.h b/src/lisp.h
index 5a5e7dbec6b..074c758ce8e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2872,6 +2872,7 @@ extern Lisp_Object safe_call (int, Lisp_Object *);
2872extern Lisp_Object safe_call1 (Lisp_Object, Lisp_Object); 2872extern Lisp_Object safe_call1 (Lisp_Object, Lisp_Object);
2873extern Lisp_Object safe_call2 (Lisp_Object, Lisp_Object, Lisp_Object); 2873extern Lisp_Object safe_call2 (Lisp_Object, Lisp_Object, Lisp_Object);
2874extern void init_eval (void); 2874extern void init_eval (void);
2875extern void mark_backtrace (void);
2875extern void syms_of_eval (void); 2876extern void syms_of_eval (void);
2876 2877
2877/* Defined in editfns.c */ 2878/* Defined in editfns.c */