diff src/xfns.c @ 90602:b5c13d1564a9

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 437-446) - Update from CVS - lisp/url/url-methods.el: Fix format error when http_proxy is empty string - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 137-140) - Update from CVS Revision: [e-mail]/emacs--unicode--0--patch-111

--- a/src/xfns.c	Thu Sep 14 09:24:00 2006 +0000
+++ b/src/xfns.c	Wed Sep 20 06:04:23 2006 +0000
@@ -157,12 +157,16 @@
 
 /* Non-zero means prompt with the old GTK file selection dialog.  */
 
-int x_use_old_gtk_file_dialog;
+int x_gtk_use_old_file_dialog;
 
 /* If non-zero, by default show hidden files in the GTK file chooser.  */
 
 int x_gtk_show_hidden_files;
 
+/* If non-zero, don't show additional help text in the GTK file chooser.  */
+
+int x_gtk_file_dialog_help_text;
+
 /* If non-zero, don't collapse to tool bar when it is detached.  */
 
 int x_gtk_whole_detached_tool_bar;
@@ -5886,12 +5890,12 @@
   Vx_pixel_size_width_font_regexp = Qnil;
 
 /* This is not ifdef:ed, so other builds than GTK can customize it.  */
-  DEFVAR_BOOL ("x-use-old-gtk-file-dialog", &x_use_old_gtk_file_dialog,
+  DEFVAR_BOOL ("x-gtk-use-old-file-dialog", &x_gtk_use_old_file_dialog,
     doc: /* *Non-nil means prompt with the old GTK file selection dialog.
 If nil or if the file selection dialog is not available, the new GTK file
 chooser is used instead.  To turn off all file dialogs set the
 variable `use-file-dialog'.  */);
-  x_use_old_gtk_file_dialog = 0;
+  x_gtk_use_old_file_dialog = 0;
 
   DEFVAR_BOOL ("x-gtk-show-hidden-files", &x_gtk_show_hidden_files,
     doc: /* *If non-nil, the GTK file chooser will by default show hidden files.
@@ -5899,6 +5903,12 @@
 chooser to show or not show hidden files on a case by case basis.  */);
   x_gtk_show_hidden_files = 0;
 
+  DEFVAR_BOOL ("x-gtk-file-dialog-help-text", &x_gtk_file_dialog_help_text,
+    doc: /* *If non-nil, the GTK file chooser will by show additional help text.
+If more space for files in the file chooser dialog is wanted, set this to nil
+to turn the additional text off.  */);
+  x_gtk_file_dialog_help_text = 1;
+
   DEFVAR_BOOL ("x-gtk-whole-detached-tool-bar", &x_gtk_whole_detached_tool_bar,
     doc: /* *If non-nil, a detached tool bar is shown in full.
 The default is to just show an arrow and pressing on that arrow shows