diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-01-18 13:46:22 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-01-18 13:46:22 +0200 |
| commit | 5197f0c2fee01c473b4876f6a49e784250f63640 (patch) | |
| tree | 31e0bf2968e74fbde5da7f1e0e13cdcd6e0c07ea /nt | |
| parent | 812a093042a860768b002b988789c53d31127bb6 (diff) | |
| download | emacs-5197f0c2fee01c473b4876f6a49e784250f63640.tar.gz | |
Fix file name handling on MS-Windows 9X.
src/w32.c (maybe_load_unicows_dll): New function.
src/emacs.c (main) [WINDOWSNT]: Call maybe_load_unicows_dll early
on, to make sure we can convert file names to and from UTF-8 on
Windows 9X. This fixes a failure to start up because Emacs cannot
find term/w32-win.el. Reported by oslsachem <oslsachem@gmail.com>.
src/w32font.c [WINDOWSNT]: Include w32.h.
(w32_load_unicows_or_gdi32): Call maybe_load_unicows_dll, instead
of implementing the same stuff.
Remove now unused g_b_init_is_windows_9x.
src/w32.h (maybe_load_unicows_dll): Add prototype.
nt/runemacs.c (ensure_unicows_dll): Don't tell in the message box
that "emacs -nw" can do without UNICOWS.DLL on Windows 9X. See
w32.c:maybe_load_unicows_dll and its callers for the reason.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/runemacs.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index c27b6fc38ba..bf7dc902017 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2014-01-18 Eli Zaretskii <eliz@gnu.org> + + * runemacs.c (ensure_unicows_dll): Don't tell in the message box + that "emacs -nw" can do without UNICOWS.DLL on Windows 9X. See + w32.c:maybe_load_unicows_dll and its callers for the reason. + 2014-01-11 Claudio Bley <claudio.bley@googlemail.com> * inc/sys/stat.h (_WSTAT_DEFINED): Define, to avoid compilation diff --git a/nt/runemacs.c b/nt/runemacs.c index 20b6f0cab7b..5b851f4b65a 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -234,8 +234,6 @@ ensure_unicows_dll (void) "Emacs cannot load the UNICOWS.DLL library.\n" "This library is essential for using Emacs\n" "on this system. You need to install it.\n\n" - "However, you can still use Emacs by invoking\n" - "it with the '-nw' command-line option.\n\n" "Emacs will exit when you click OK.", "Emacs cannot load UNICOWS.DLL", MB_ICONERROR | MB_TASKMODAL |