aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorKarl Heuer1999-08-14 02:30:27 +0000
committerKarl Heuer1999-08-14 02:30:27 +0000
commitfada05d6d14fdf4de2d6cc1479aa8584baf225cd (patch)
tree2a8c27de2a3096c660db0be6c69fc3ee4536bfae /src/eval.c
parent5f47720c30c98d0952db409e842329179432d498 (diff)
downloademacs-fada05d6d14fdf4de2d6cc1479aa8584baf225cd.tar.gz
emacs-fada05d6d14fdf4de2d6cc1479aa8584baf225cd.zip
(run_hook_list_with_args): Gcpro `globals'.
(run_hook_with_args): Likewise.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/eval.c b/src/eval.c
index 80d45a0060f..735d1ee6f25 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2089,7 +2089,8 @@ run_hook_with_args (nargs, args, cond)
2089 enum run_hooks_condition cond; 2089 enum run_hooks_condition cond;
2090{ 2090{
2091 Lisp_Object sym, val, ret; 2091 Lisp_Object sym, val, ret;
2092 struct gcpro gcpro1, gcpro2; 2092 Lisp_Object globals;
2093 struct gcpro gcpro1, gcpro2, gcpro3;
2093 2094
2094 /* If we are dying or still initializing, 2095 /* If we are dying or still initializing,
2095 don't do anything--it would probably crash if we tried. */ 2096 don't do anything--it would probably crash if we tried. */
@@ -2109,7 +2110,8 @@ run_hook_with_args (nargs, args, cond)
2109 } 2110 }
2110 else 2111 else
2111 { 2112 {
2112 GCPRO2 (sym, val); 2113 globals = Qnil;
2114 GCPRO3 (sym, val, globals);
2113 2115
2114 for (; 2116 for (;
2115 CONSP (val) && ((cond == to_completion) 2117 CONSP (val) && ((cond == to_completion)
@@ -2121,7 +2123,6 @@ run_hook_with_args (nargs, args, cond)
2121 { 2123 {
2122 /* t indicates this hook has a local binding; 2124 /* t indicates this hook has a local binding;
2123 it means to run the global binding too. */ 2125 it means to run the global binding too. */
2124 Lisp_Object globals;
2125 2126
2126 for (globals = Fdefault_value (sym); 2127 for (globals = Fdefault_value (sym);
2127 CONSP (globals) && ((cond == to_completion) 2128 CONSP (globals) && ((cond == to_completion)
@@ -2163,10 +2164,12 @@ run_hook_list_with_args (funlist, nargs, args)
2163{ 2164{
2164 Lisp_Object sym; 2165 Lisp_Object sym;
2165 Lisp_Object val; 2166 Lisp_Object val;
2166 struct gcpro gcpro1, gcpro2; 2167 Lisp_Object globals;
2168 struct gcpro gcpro1, gcpro2, gcpro3;
2167 2169
2168 sym = args[0]; 2170 sym = args[0];
2169 GCPRO2 (sym, val); 2171 globals = Qnil;
2172 GCPRO3 (sym, val, globals);
2170 2173
2171 for (val = funlist; CONSP (val); val = XCONS (val)->cdr) 2174 for (val = funlist; CONSP (val); val = XCONS (val)->cdr)
2172 { 2175 {
@@ -2174,7 +2177,6 @@ run_hook_list_with_args (funlist, nargs, args)
2174 { 2177 {
2175 /* t indicates this hook has a local binding; 2178 /* t indicates this hook has a local binding;
2176 it means to run the global binding too. */ 2179 it means to run the global binding too. */
2177 Lisp_Object globals;
2178 2180
2179 for (globals = Fdefault_value (sym); 2181 for (globals = Fdefault_value (sym);
2180 CONSP (globals); 2182 CONSP (globals);