diff options
| author | Kenichi Handa | 2002-10-25 12:32:18 +0000 |
|---|---|---|
| committer | Kenichi Handa | 2002-10-25 12:32:18 +0000 |
| commit | 869331eef11afdb3fb68ecc62185ecbbea4c744f (patch) | |
| tree | 66dbb43324a81f0ba7925eea4a7e0225589be5b8 /src | |
| parent | be354eca5aa67a5c527e41b092dac36cf221fa96 (diff) | |
| download | emacs-869331eef11afdb3fb68ecc62185ecbbea4c744f.tar.gz emacs-869331eef11afdb3fb68ecc62185ecbbea4c744f.zip | |
(x_set_name): Encode by Qcompound_text unconditionally.
(x_set_title): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 8 |
1 files changed, 2 insertions, 6 deletions
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) | |||
| 2439 | int bytes, stringp; | 2439 | int bytes, stringp; |
| 2440 | Lisp_Object coding_system; | 2440 | Lisp_Object coding_system; |
| 2441 | 2441 | ||
| 2442 | coding_system = Vlocale_coding_system; | 2442 | coding_system = Qcompound_text; |
| 2443 | if (NILP (coding_system)) | ||
| 2444 | coding_system = Qcompound_text; | ||
| 2445 | text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp); | 2443 | text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp); |
| 2446 | text.encoding = (stringp ? XA_STRING | 2444 | text.encoding = (stringp ? XA_STRING |
| 2447 | : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT); | 2445 | : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT); |
| @@ -2546,9 +2544,7 @@ x_set_title (f, name, old_name) | |||
| 2546 | int bytes, stringp; | 2544 | int bytes, stringp; |
| 2547 | Lisp_Object coding_system; | 2545 | Lisp_Object coding_system; |
| 2548 | 2546 | ||
| 2549 | coding_system = Vlocale_coding_system; | 2547 | coding_system = Qcompound_text; |
| 2550 | if (NILP (coding_system)) | ||
| 2551 | coding_system = Qcompound_text; | ||
| 2552 | text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp); | 2548 | text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp); |
| 2553 | text.encoding = (stringp ? XA_STRING | 2549 | text.encoding = (stringp ? XA_STRING |
| 2554 | : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT); | 2550 | : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT); |