Mercurial > emacs
diff lisp/term/x-win.el @ 83194:b15f799f66b5
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-489
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-490
Update from CVS: man/fixit.texi (Spelling): Fix typo.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-491
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-492
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-493
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-494
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-495
Update from CVS: Add missing lisp/mh-e files
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-496
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-497
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-498
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-499
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-500
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-234
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 19 Aug 2004 15:05:01 +0000 |
parents | 7652900ea029 302e4e1415d3 |
children | 549734260e34 |
line wrap: on
line diff
--- a/lisp/term/x-win.el Thu Aug 19 14:30:16 2004 +0000 +++ b/lisp/term/x-win.el Thu Aug 19 15:05:01 2004 +0000 @@ -2217,7 +2217,8 @@ (if utf8 (setq text (x-select-utf8-or-ctext utf8 ctext)) ;; Othewise, choose CTEXT. - (setq text ctext)))) + (setq text ctext)) + (setq text utf8))) ;; If not yet decided, try STRING. (or text (setq text (condition-case nil