(run-hook-with-args, run-hook-list-with-args): Safeguard
against a t in the global value of hook variables.
This commit is contained in:
parent
ebeafce6a5
commit
77d92e0582
1 changed files with 8 additions and 2 deletions
10
src/eval.c
10
src/eval.c
|
@ -1959,7 +1959,10 @@ run_hook_with_args (nargs, args, cond)
|
|||
globals = XCONS (globals)->cdr)
|
||||
{
|
||||
args[0] = XCONS (globals)->car;
|
||||
ret = Ffuncall (nargs, args);
|
||||
/* In a global value, t should not occur. If it does, we
|
||||
must ignore it to avoid an endless loop. */
|
||||
if (!EQ (args[0], Qt))
|
||||
ret = Ffuncall (nargs, args);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
@ -2007,7 +2010,10 @@ run_hook_list_with_args (funlist, nargs, args)
|
|||
globals = XCONS (globals)->cdr)
|
||||
{
|
||||
args[0] = XCONS (globals)->car;
|
||||
Ffuncall (nargs, args);
|
||||
/* In a global value, t should not occur. If it does, we
|
||||
must ignore it to avoid an endless loop. */
|
||||
if (!EQ (args[0], Qt))
|
||||
Ffuncall (nargs, args);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Reference in a new issue