Merge from emacs--rel--22

Revision: [email protected]/emacs--devo--0--patch-1006

1 files changed, 4 insertions, 3 deletions

diff --git a/src/fns.c b/src/fns.c
index aee268f306..01c7e58366 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -5829,9 +5829,10 @@ invoked by mouse clicks and mouse menu items.  */);
 
   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.  */);
+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.  */);
   use_file_dialog = 1;
 
   defsubr (&Sidentity);