* macfns.c (Fx_file_dialog): Save As dialog includes only the

	file name in the text box.

diff --git a/src/ChangeLog b/src/ChangeLog
index 07beb35f6853097e45bb20b44fc95e9fadb4b56b..a8dd700f7d56e487ea20980aae344f5600cf8a47 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-15  Steven Tamm  <steventamm@mac.com>
+
+       * macfns.c (Fx_file_dialog): Save As dialog includes only the
+       file name in the text box.
+
 2005-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * macfns.c (x_set_foreground_color, x_set_background_color): Sync

diff --git a/src/macfns.c b/src/macfns.c
index 2b223dfdfb557990b3659b315e656750ca14880a..33da9091575de86582ea18ab2ced68aff2b5bfa7 100644 (file)
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -4356,9 +4356,12 @@ If ONLY-DIR-P is non-nil, the user can only select directories.  */)
 
        if (!NILP(default_filename))
          {
-           saveName =
-             cfstring_create_with_utf8_cstring (SDATA (ENCODE_UTF_8
-                                                       (default_filename)));
+           Lisp_Object utf8 = ENCODE_UTF_8 (default_filename);
+           char *begPtr = SDATA(utf8);
+           char *filePtr = begPtr + SBYTES(utf8);
+           while (filePtr != begPtr && !IS_DIRECTORY_SEP(filePtr[-1]))
+             filePtr--;
+           saveName = cfstring_create_with_utf8_cstring (filePtr);
            options.saveFileName = saveName;
            options.optionFlags |= kNavSelectDefaultLocation;
          }