3 files changed, 24 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d2f1999b546..493bcde7418 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32fns.c (Fx_file_dialog): Mention in the doc string the
+        behavior on Windows 7 and later when the function is repeatedly
+        invoked with the same value of DIR.  (Bug#17950)
+
+        * xfns.c (Fx_file_dialog) [USE_MOTIF, USE_GTK]: Update the doc
+        string to match the one in w32fns.c.
+
 2014-07-08  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (move_it_to): Adjust calculation of line_start_x to what
diff --git a/src/w32fns.c b/src/w32fns.c
index 638c617df99..1c73cda469a 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -6436,7 +6436,11 @@ or directory must exist.
 
 This function is only defined on NS, MS Windows, and X Windows with the
 Motif or Gtk toolkits.  With the Motif toolkit, ONLY-DIR-P is ignored.
-Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.  */)
+Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.
+On Windows 7 and later, the file selection dialog "remembers" the last
+directory where the user selected a file, and will open that directory
+instead of DIR on subsequent invocations of this function with the same
+value of DIR as in previous invocations; this is standard Windows behavior.  */)
   (Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename, Lisp_Object mustmatch, Lisp_Object only_dir_p)
 {
   /* Filter index: 1: All Files, 2: Directories only  */
diff --git a/src/xfns.c b/src/xfns.c
index 692504ef762..23fba44f1f3 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5658,7 +5658,11 @@ or directory must exist.
 
 This function is only defined on NS, MS Windows, and X Windows with the
 Motif or Gtk toolkits.  With the Motif toolkit, ONLY-DIR-P is ignored.
-Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.  */)
+Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.
+On Windows 7 and later, the file selection dialog "remembers" the last
+directory where the user selected a file, and will open that directory
+instead of DIR on subsequent invocations of this function with the same
+value of DIR as in previous invocations; this is standard Windows behavior.  */)
   (Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename,
    Lisp_Object mustmatch, Lisp_Object only_dir_p)
 {
@@ -5830,7 +5834,11 @@ or directory must exist.
 
 This function is only defined on NS, MS Windows, and X Windows with the
 Motif or Gtk toolkits.  With the Motif toolkit, ONLY-DIR-P is ignored.
-Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.  */)
+Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.
+On Windows 7 and later, the file selection dialog "remembers" the last
+directory where the user selected a file, and will open that directory
+instead of DIR on subsequent invocations of this function with the same
+value of DIR as in previous invocations; this is standard Windows behavior.  */)
   (Lisp_Object prompt, Lisp_Object dir, Lisp_Object default_filename, Lisp_Object mustmatch, Lisp_Object only_dir_p)
 {
   struct frame *f = SELECTED_FRAME ();