From f84c17c70c7690fef20ec88c540f1827b3a7790c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 3 Apr 2011 21:10:13 -0400 Subject: [PATCH] * src/keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the first non-nil return value). --- src/ChangeLog | 5 +++++ src/keyboard.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index b11aa27eeaf..d12969fe46a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-04-04 Stefan Monnier + + * 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 * 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 d307250b868..f766dd7d697 100644 --- 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 -- 2.39.5