comparison src/fileio.c @ 28117:9fa9af3f0ca7

(Fread_file_name): Handle case that DIR contains a file name.

28116:25edeaccc41f

#ifdef USE_MOTIF
  if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
      && use_dialog_box
      && have_menus_p ())
    {
      val = Fx_file_dialog (prompt, dir, default_filename, mustmatch);
      add_to_history = 1;
    }
  else
#endif

28117:9fa9af3f0ca7

#ifdef USE_MOTIF
  if ((NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
      && 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;
    }
  else
#endif