(Fx_file_dialog): Call check_x.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7c1babe6fbafdc9eb9381fdb028b060ce81cd443..eeaddd967cb2060903bb4838e8a38bbe8cc9242e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,17 @@
+2006-09-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * src/mac.c [MAC_OSX] (sys_select): Check argument `nfds' more
+       rigidly.  Make variable `ofds' static.  Remove variable `maxfd'.
+
+       * src/macfns.c (Fx_file_dialog): Remove unused variable `f'.  Call
+       check_mac.
+
+       * src/macmenu.c (Vmenu_updating_frame, syms_of_xmenu):
+       * src/w32menu.c (Vmenu_updating_frame, syms_of_xmenu): Apply
+       2006-09-08 change for xmenu.c.
+
+       * src/xfns.c (Fx_file_dialog): Call check_x.
+
 2006-09-10  Kim F. Storm  <storm@cua.dk>
 
        * xdisp.c (get_window_cursor_type): Use hollow cursor on

diff --git a/src/xfns.c b/src/xfns.c
index 8071ff1c4e6f7ef8470e514ca18dbd50030d1abe..dd8035c95afbfcf3c7f15b9a1c28a1c8f450e8e2 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5328,6 +5328,8 @@ or directory must exist.  ONLY-DIR-P is ignored."  */)
   int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
 
+  check_x ();
+
   GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
 
   if (popup_activated ())
@@ -5495,6 +5497,8 @@ directories.  */)
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, gcpro6;
   char *cdef_file;
 
+  check_x ();
+
   GCPRO6 (prompt, dir, default_filename, mustmatch, only_dir_p, file);
 
   if (popup_activated ())