3.4.3

mintty · Nov 11, 2020 · 0207257 · 0207257
1 parent a5e99c2
commit 0207257
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.4.2
+3.4.3
diff --git a/docs/mintty.1.html b/docs/mintty.1.html
diff --git a/lang/messages.pot b/lang/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mintty\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-04 18:29+0100\n"
+"POT-Creation-Date: 2020-11-11 10:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/src/appinfo.h b/src/appinfo.h
@@ -6,7 +6,7 @@
 
 #define MAJOR_VERSION  3
 #define MINOR_VERSION  4
-#define PATCH_NUMBER   2
+#define PATCH_NUMBER   3
 #define BUILD_NUMBER   0
 
 // needed for res.rc

diff --git a/src/charset.c b/src/charset.c
@@ -706,17 +706,17 @@ cs_init(void)
       setlocenv("LC_CTYPE", env_locale);
       trace_locale("cs_init win env", env_locale);
 
+#if HAS_LOCALES
       // ensure reliable single-width of system-derived UTF-8 locales
       if (cfg.charwidth < 10 && wcwidth(0x3B1) == 2) {
         string el = asform("%s@cjknarrow", env_locale);
         delete(env_locale);
         env_locale = el;
-#if HAS_LOCALES
         setlocale(LC_CTYPE, env_locale);
-#endif
         setlocenv("LC_CTYPE", env_locale);
         trace_locale("cs_init win env", env_locale);
       }
+#endif
     }
   }
 

diff --git a/wiki/Changelog.md b/wiki/Changelog.md
@@ -1,3 +1,5 @@
+### 3.4.3 (11 November 2020) ###
+
 Character encoding
   * Fixed locale setup interworking with bash startup profile (~#1050).
   * Handling empty startup locale to be consistent with system-derived shell locale (~#1050).