[Emacs-diffs] /srv/bzr/emacs/trunk r103818: * src/keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the

[Stefan Monnier]

------------------------------------------------------------
revno: 103818
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2011-04-03 21:10:13 -0400
message:
  * src/keyboard.c (safe_run_hook_funcall): Fix last change (don't stop at the
  first non-nil return value).
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-04-03 08:30:57 +0000
+++ b/src/ChangeLog     2011-04-04 01:10:13 +0000
@@ -1,3 +1,8 @@
+2011-04-04  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * nsterm.m (ns_update_auto_hide_menu_bar): Define MAC_OS_X_VERSION_10_6

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2011-03-31 04:24:03 +0000
+++ b/src/keyboard.c    2011-04-04 01:10:13 +0000
@@ -1870,7 +1870,8 @@
   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