diff options
| author | Eli Zaretskii | 2014-09-13 11:26:44 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-09-13 11:26:44 +0300 |
| commit | a6cc335aef90cb4a2dc3fde77cbea9886240301e (patch) | |
| tree | 2f01a0d438766d70cfbd50880950f6b2a4b0acf0 /src/ChangeLog | |
| parent | e868e853a85fb4466ab045962a269db31760f354 (diff) | |
| download | emacs-a6cc335aef90cb4a2dc3fde77cbea9886240301e.tar.gz emacs-a6cc335aef90cb4a2dc3fde77cbea9886240301e.zip | |
Fix expansion and encoding of sound file names on MS-Windows.
src/sound.c (Fplay_sound_internal): Encode the sound file name in
the ANSI codepage. Expand it against data-directory, as per docs,
not against the current directory. No need to make a local copy
of the file name; pass the encoded file name directly to
do_play_sound. (Bug#18463)
src/w32.c (ansi_encode_filename): If w32_get_short_filename returns
NULL, and the file name is not encodable in ANSI codepage, return
the string with "?" replacement characters, which will fail the
caller. This avoids returning a random value in that case.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0117b83feb1..4f851edb0fd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2014-09-13 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * sound.c (Fplay_sound_internal): Encode the sound file name in | ||
| 4 | the ANSI codepage. Expand it against data-directory, as per docs, | ||
| 5 | not against the current directory. No need to make a local copy | ||
| 6 | of the file name; pass the encoded file name directly to | ||
| 7 | do_play_sound. (Bug#18463) | ||
| 8 | |||
| 9 | * w32.c (ansi_encode_filename): If w32_get_short_filename returns | ||
| 10 | NULL, and the file name is not encodable in ANSI codepage, return | ||
| 11 | the string with "?" replacement characters, which will fail the | ||
| 12 | caller. This avoids returning a random value in that case. | ||
| 13 | |||
| 1 | 2014-09-11 Martin Rudalics <rudalics@gmx.at> | 14 | 2014-09-11 Martin Rudalics <rudalics@gmx.at> |
| 2 | 15 | ||
| 3 | * window.c (Fresize_mini_window_internal): Set w->total_lines | 16 | * window.c (Fresize_mini_window_internal): Set w->total_lines |