From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 4 Apr 2011 01:10:13 +0000 (-0400)
Subject: * src/keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~418
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f84c17c70c7690fef20ec88c540f1827b3a7790c;p=emacs.git

* 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 b11aa27eeaf..d12969fe46a 100644
--- 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 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