XEmacs 21.4.7 "Economic Science".

[chise/xemacs-chise.git.1] / src / event-stream.c

diff --git a/src/event-stream.c b/src/event-stream.c
index b390e52..3585a3b 100644 (file)
--- a/src/event-stream.c
+++ b/src/event-stream.c
@@ -3785,8 +3785,8 @@ is_scrollbar_event (Lisp_Object event)
          EQ (fun, Qscrollbar_to_right) ||
          EQ (fun, Qscrollbar_horizontal_drag));
 #else
-  return 0
-#endif
+  return 0;
+#endif /* HAVE_SCROLLBARS */
 }
 
 static void
@@ -4303,6 +4303,7 @@ See `function-key-map' for more details.
   struct gcpro gcpro1;
   GCPRO1 (event);
 
+  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
   if (!NILP (prompt))
     CHECK_STRING (prompt);
   /* else prompt = Fkeymap_prompt (current_buffer->keymap); may GC */