diff options
| author | Jason Rumney | 2004-07-19 07:58:24 +0000 |
|---|---|---|
| committer | Jason Rumney | 2004-07-19 07:58:24 +0000 |
| commit | dda741ec19783b40b4b190a7789289f4a92caba0 (patch) | |
| tree | b6b957b3b5c083d0d9878a3ccdb4818635dc2de1 | |
| parent | bfcf6608012308f18740cf8b6d7d0e7e26c76022 (diff) | |
| download | emacs-dda741ec19783b40b4b190a7789289f4a92caba0.tar.gz emacs-dda741ec19783b40b4b190a7789289f4a92caba0.zip | |
2004-07-19 KOBAYASHI Yasuhiro <kobayays@otsukakj.co.jp> (tiny change)
* w32fns.c (Fx_file_dialog): Use ENCODE_FILE instead of
ENCODE_SYSTEM for filenames.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/w32fns.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0c8b389b65b..cb9b391a22d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2004-07-19 KOBAYASHI Yasuhiro <kobayays@otsukakj.co.jp> (tiny change) | ||
| 2 | |||
| 3 | * w32fns.c (Fx_file_dialog): Use ENCODE_FILE instead of | ||
| 4 | ENCODE_SYSTEM for filenames. | ||
| 5 | |||
| 1 | 2004-07-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2004-07-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * mac.c (sys_select): Block input around call to | 8 | * mac.c (sys_select): Block input around call to |
diff --git a/src/w32fns.c b/src/w32fns.c index d5ba6e9b078..0cb3abe91cd 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -7735,14 +7735,14 @@ specified. Ensure that file exists if MUSTMATCH is non-nil. */) | |||
| 7735 | /* Create the dialog with PROMPT as title, using DIR as initial | 7735 | /* Create the dialog with PROMPT as title, using DIR as initial |
| 7736 | directory and using "*" as pattern. */ | 7736 | directory and using "*" as pattern. */ |
| 7737 | dir = Fexpand_file_name (dir, Qnil); | 7737 | dir = Fexpand_file_name (dir, Qnil); |
| 7738 | strncpy (init_dir, SDATA (ENCODE_SYSTEM (dir)), MAX_PATH); | 7738 | strncpy (init_dir, SDATA (ENCODE_FILE (dir)), MAX_PATH); |
| 7739 | init_dir[MAX_PATH] = '\0'; | 7739 | init_dir[MAX_PATH] = '\0'; |
| 7740 | unixtodos_filename (init_dir); | 7740 | unixtodos_filename (init_dir); |
| 7741 | 7741 | ||
| 7742 | if (STRINGP (default_filename)) | 7742 | if (STRINGP (default_filename)) |
| 7743 | { | 7743 | { |
| 7744 | char *file_name_only; | 7744 | char *file_name_only; |
| 7745 | char *full_path_name = SDATA (ENCODE_SYSTEM (default_filename)); | 7745 | char *full_path_name = SDATA (ENCODE_FILE (default_filename)); |
| 7746 | 7746 | ||
| 7747 | unixtodos_filename (full_path_name); | 7747 | unixtodos_filename (full_path_name); |
| 7748 | 7748 | ||