3 files changed, 21 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index dc5f96e1f3f..19ffd8f9428 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * fileio.c (Fread_file_name): Check use_file_dialog also before
+        calling Fx_file_dialog.
+
+        * fns.c: use_file_dialog: New variable.
+        (syms_of_fns): DEFVAR_BOOL use-file-dialog.
+
 2003-11-29  Kim F. Storm  <storm@cua.dk>
 
         * msdos.c (Qcursor_type, Qbar, Qhbar): Declare extern.
diff --git a/src/fileio.c b/src/fileio.c
index 9ed46109951..e586407cecc 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -134,6 +134,7 @@ extern int errno;
 
 #include "commands.h"
 extern int use_dialog_box;
+extern int use_file_dialog;
 
 #ifndef O_WRONLY
 #define O_WRONLY 1
@@ -6212,6 +6213,7 @@ provides a file dialog box.  */)
 #if defined (USE_MOTIF) || defined (HAVE_NTGUI) || defined (USE_GTK)
   if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
       && use_dialog_box
+      && use_file_dialog
       && have_menus_p ())
     {
       /* If DIR contains a file name, split it.  */
diff --git a/src/fns.c b/src/fns.c
index 18bf8d62a8b..fed948dc29f 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -59,6 +59,10 @@ Boston, MA 02111-1307, USA.  */
    asked by mouse commands.  */
 int use_dialog_box;
 
+/* Nonzero enables use of a file dialog for file name
+   questions asked by mouse commands.  */
+int use_file_dialog;
+
 extern int minibuffer_auto_raise;
 extern Lisp_Object minibuf_window;
 extern Lisp_Object Vlocale_coding_system;
@@ -5638,6 +5642,13 @@ This applies to `y-or-n-p' and `yes-or-no-p' questions asked by commands
 invoked by mouse clicks and mouse menu items.  */);
   use_dialog_box = 1;
 
+  DEFVAR_BOOL ("use-file-dialog", &use_file_dialog,
+    doc: /* *Non-nil means mouse commands use a file dialog to ask for files.
+This applies to commands from menus and tool bar buttons.  The value of
+`use-dialog-box' takes precedence over this variable, so a file dialog is only
+used if both `use-dialog-box' and this variable are non-nil.  */);
+  use_file_dialog = 1;
+  
   defsubr (&Sidentity);
   defsubr (&Srandom);
   defsubr (&Slength);