From: Yuuki Harano <masm+github@masm11.me>
Date: Mon, 20 Jul 2020 12:35:21 +0000 (+0900)
Subject: Fix non-English layout does not work
X-Git-Tag: emacs-29.0.90~3785
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7190d8bb251afd11ac91a3b3c64243a0e8a0cd0;p=emacs.git

Fix non-English layout does not work

* src/pgtkterm.c (key_press_event): Use Vlocale_coding_system.
---

diff --git a/src/pgtkterm.c b/src/pgtkterm.c
index 6b193bae3eb..f49bcac2943 100644
--- a/src/pgtkterm.c
+++ b/src/pgtkterm.c
@@ -5492,9 +5492,9 @@ key_press_event (GtkWidget * widget, GdkEvent * event, gpointer * user_data)
 	  {
 	    /* Decode the input data.  */
 
-	    /* The input should be decoded with `coding_system'
-	       which depends on which X*LookupString function
-	       we used just above and the locale.  */
+	    /* The input should be decoded with locale `coding_system'. */
+	    if (!NILP (Vlocale_coding_system))
+	      coding_system = Vlocale_coding_system;
 	    setup_coding_system (coding_system, &coding);
 	    coding.src_multibyte = false;
 	    coding.dst_multibyte = true;