From 8932b1c23656efbb76e0fc60d845c8b854cf509a Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Fri, 1 Jan 2010 12:14:05 -0500 Subject: [PATCH] * eval.c (run_hook_with_args): Handle the case where the global value has the obsolete single-function form (Bug#5026). --- src/ChangeLog | 5 +++++ src/eval.c | 33 +++++++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 92f4fe45f35..d6447678e0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-01-01 Chong Yidong + + * eval.c (run_hook_with_args): Handle the case where the global + value has the obsolete single-function form (Bug#5026). + 2009-12-27 Chong Yidong * minibuf.c (Fall_completions): Minor optimization. diff --git a/src/eval.c b/src/eval.c index 1c975003318..0198fb7c131 100644 --- a/src/eval.c +++ b/src/eval.c @@ -2620,7 +2620,6 @@ run_hook_with_args (nargs, args, cond) enum run_hooks_condition cond; { Lisp_Object sym, val, ret; - Lisp_Object globals; struct gcpro gcpro1, gcpro2, gcpro3; /* If we are dying or still initializing, @@ -2641,7 +2640,7 @@ run_hook_with_args (nargs, args, cond) } else { - globals = Qnil; + Lisp_Object globals = Qnil; GCPRO3 (sym, val, globals); for (; @@ -2654,18 +2653,28 @@ run_hook_with_args (nargs, args, cond) { /* t indicates this hook has a local binding; it means to run the global binding too. */ + globals = Fdefault_value (sym); + if (NILP (globals)) continue; - for (globals = Fdefault_value (sym); - CONSP (globals) && ((cond == to_completion) - || (cond == until_success ? NILP (ret) - : !NILP (ret))); - globals = XCDR (globals)) + if (!CONSP (globals) || EQ (XCAR (globals), Qlambda)) + { + args[0] = globals; + ret = Ffuncall (nargs, args); + } + else { - args[0] = XCAR (globals); - /* 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); + for (; + CONSP (globals) && ((cond == to_completion) + || (cond == until_success ? NILP (ret) + : !NILP (ret))); + globals = XCDR (globals)) + { + args[0] = XCAR (globals); + /* 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 -- 2.39.2