Merged in changes from CVS HEAD

[bpt/emacs.git] / src / keyboard.c

diff --git a/src/keyboard.c b/src/keyboard.c
index 11e1d18..8223049 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1322,6 +1322,7 @@ cancel_hourglass_unwind (arg)
      Lisp_Object arg;
 {
   cancel_hourglass ();
+  return Qnil;
 }
 #endif