Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
83193:e6f198d9e7d3 | 83194:b15f799f66b5 |
---|---|
2215 ;; If UTF8_STRING was also successful, choose the | 2215 ;; If UTF8_STRING was also successful, choose the |
2216 ;; more appropriate one from UTF8 and CTEXT. | 2216 ;; more appropriate one from UTF8 and CTEXT. |
2217 (if utf8 | 2217 (if utf8 |
2218 (setq text (x-select-utf8-or-ctext utf8 ctext)) | 2218 (setq text (x-select-utf8-or-ctext utf8 ctext)) |
2219 ;; Othewise, choose CTEXT. | 2219 ;; Othewise, choose CTEXT. |
2220 (setq text ctext)))) | 2220 (setq text ctext)) |
2221 (setq text utf8))) | |
2221 ;; If not yet decided, try STRING. | 2222 ;; If not yet decided, try STRING. |
2222 (or text | 2223 (or text |
2223 (setq text (condition-case nil | 2224 (setq text (condition-case nil |
2224 (x-get-selection type 'STRING) | 2225 (x-get-selection type 'STRING) |
2225 (error nil)))) | 2226 (error nil)))) |