From 42afbcda13137806a3fd51c466526e29026947b9 Mon Sep 17 00:00:00 2001 From: Steven Tamm Date: Sun, 16 Jan 2005 00:17:25 +0000 Subject: [PATCH] * macfns.c (Fx_file_dialog): Save As dialog includes only the file name in the text box. --- src/ChangeLog | 5 +++++ src/macfns.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 07beb35f68..a8dd700f7d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-01-15 Steven Tamm + + * macfns.c (Fx_file_dialog): Save As dialog includes only the + file name in the text box. + 2005-01-15 YAMAMOTO Mitsuharu * macfns.c (x_set_foreground_color, x_set_background_color): Sync diff --git a/src/macfns.c b/src/macfns.c index 2b223dfdfb..33da909157 100644 --- 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; } -- 2.39.2