[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e10940f 3/3: Merge from origin/emacs-27
From: |
Paul Eggert |
Subject: |
master e10940f 3/3: Merge from origin/emacs-27 |
Date: |
Tue, 2 Jun 2020 01:30:59 -0400 (EDT) |
branch: master
commit e10940f3f14e91e2740b139c1ff2983a88d66cc7
Merge: 8c3ed29 0260d2d
Author: Paul Eggert <eggert@cs.ucla.edu>
Commit: Paul Eggert <eggert@cs.ucla.edu>
Merge from origin/emacs-27
0260d2d2db Don't call 'mbrtowc' on WINDOWSNT
---
src/emacs.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/emacs.c b/src/emacs.c
index 49793fd..45a215b 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -358,7 +358,10 @@ setlocale (int cat, char const *locale)
static bool
using_utf8 (void)
{
-#ifdef HAVE_WCHAR_H
+ /* We don't want to compile in mbrtowc on WINDOWSNT because that
+ will prevent Emacs from starting on older Windows systems, while
+ the result is known in advance anyway... */
+#if defined HAVE_WCHAR_H && !defined WINDOWSNT
wchar_t wc;
mbstate_t mbs = { 0 };
return mbrtowc (&wc, "\xc4\x80", 2, &mbs) == 2 && wc == 0x100;