(run-hook-with-args, run-hook-list-with-args): Safeguard

against a t in the global value of hook variables.

diff --git a/src/eval.c b/src/eval.c
index af3624efd85072fbc0889685e1d7d2cf1b1cdec0..91a98d6206d0cb2eabc948b35453e769de3496a6 100644 (file)
--- a/src/eval.c
+++ b/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