Mercurial > emacs
comparison src/xfns.c @ 48000:5144fabfb105
(x_set_name): Encode by Qcompound_text unconditionally.
(x_set_title): Likewise.
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Fri, 25 Oct 2002 12:32:18 +0000 |
parents | ed2cc4e5f0b8 |
children | 7ce5ded16e10 |
comparison
equal
deleted
inserted
replaced
47999:379e8a84380d | 48000:5144fabfb105 |
---|---|
2437 { | 2437 { |
2438 XTextProperty text, icon; | 2438 XTextProperty text, icon; |
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); |
2448 text.format = 8; | 2446 text.format = 8; |
2449 text.nitems = bytes; | 2447 text.nitems = bytes; |
2544 { | 2542 { |
2545 XTextProperty text, icon; | 2543 XTextProperty text, icon; |
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); |
2555 text.format = 8; | 2551 text.format = 8; |
2556 text.nitems = bytes; | 2552 text.nitems = bytes; |