From: Kenichi Handa <handa@m17n.org>
Date: Fri, 25 Oct 2002 12:32:18 +0000 (+0000)
Subject: (x_set_name): Encode by Qcompound_text unconditionally.
X-Git-Tag: ttn-vms-21-2-B4~12726
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=869331eef11afdb3fb68ecc62185ecbbea4c744f;p=emacs.git

(x_set_name): Encode by Qcompound_text unconditionally.
(x_set_title): Likewise.
---

diff --git a/src/xfns.c b/src/xfns.c
index 52902208735..1af4921e1c6 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2439,9 +2439,7 @@ x_set_name (f, name, explicit)
 	int bytes, stringp;
 	Lisp_Object coding_system;
 
-	coding_system = Vlocale_coding_system;
-	if (NILP (coding_system))
-	  coding_system = Qcompound_text;
+	coding_system = Qcompound_text;
 	text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
 	text.encoding = (stringp ? XA_STRING
 			 : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
@@ -2546,9 +2544,7 @@ x_set_title (f, name, old_name)
 	int bytes, stringp;
 	Lisp_Object coding_system;
 
-	coding_system = Vlocale_coding_system;
-	if (NILP (coding_system))
-	  coding_system = Qcompound_text;
+	coding_system = Qcompound_text;
 	text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
 	text.encoding = (stringp ? XA_STRING
 			 : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);