* src/keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the

first non-nil return value).

diff --git a/src/ChangeLog b/src/ChangeLog
index b11aa27eeafcff71af4ced8490236b304dbbcdb1..d12969fe46aa7a1b1014c902ba25b4db1a10d9d0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the
+       first non-nil return value).
+
 2011-04-03  Jan Djärv  <jan.h.d@swipnet.se>
 
        * nsterm.m (ns_update_auto_hide_menu_bar): Define MAC_OS_X_VERSION_10_6

diff --git a/src/keyboard.c b/src/keyboard.c
index d307250b8683b4f3fa4ffb1102ff28cdffff1fdf..f766dd7d6974357f9bb118f8fb1bf92bdd14904e 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1870,7 +1870,8 @@ safe_run_hook_funcall (size_t nargs, Lisp_Object *args)
   else
     Vinhibit_quit = Fcons (Vinhibit_quit, args[0]);
 
-  return internal_condition_case (safe_run_hooks_1, Qt, safe_run_hooks_error);
+  internal_condition_case (safe_run_hooks_1, Qt, safe_run_hooks_error);
+  return Qnil;
 }
 
 /* If we get an error while running the hook, cause the hook variable