(Fread_file_name): Handle case that DIR contains a

file name.

(Fread_file_name): Handle case that DIR contains a
file name.
9172b88d · Gerd Moellmann · d21cf544 · 9172b88d · 9172b88d
Commit 9172b88d authored Mar 12, 2000 by Gerd Moellmann
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

src/ChangeLog src/ChangeLog +3 -0

src/fileio.c src/fileio.c +9 -0

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -5596,6 +5596,15 @@ DIR defaults to current buffer's directory default.")
      && use_dialog_box
      && have_menus_p ())
    {
+      /* If DIR contains a file name, split it.  */
+      Lisp_Object file;
+      file = Ffile_name_nondirectory (dir);
+      if (XSTRING (file)->size && NILP (default_filename))
+	{
+	  default_filename = file;
+	  dir = Ffile_name_directory (dir);
+	}
+      default_filename = Fexpand_file_name (default_filename, dir);
      val = Fx_file_dialog (prompt, dir, default_filename, mustmatch);
      add_to_history = 1;
    }