* fns.c (syms_of_fns): Doc fix (Bug#4227).

diff --git a/src/ChangeLog b/src/ChangeLog
index ff2cce89cb6af5f37dc923b38a34edc859f01112..ff940d6ea8badce359617528c53bd006447fd851 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-12  Chong Yidong  <cyd@stupidchicken.com>
+
+       * fns.c (syms_of_fns): Doc fix (Bug#4227).
+
 2009-09-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * keymap.c (Fwhere_is_internal): Use nconc2.

diff --git a/src/fns.c b/src/fns.c
index 562d493b59ca1b740d0e022f1727a81a937d83d5..7c3e04e818fc42b6334977aa25d635fded07bafc 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -5251,9 +5251,9 @@ non-nil.  */);
   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 even when
-they are initiated from the keyboard.  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.  */);
+they are initiated from the keyboard.  If `use-dialog-box' is nil,
+that disables the use of a file dialog, regardless of the value of
+this variable.  */);
   use_file_dialog = 1;
 
   defsubr (&Sidentity);