Mercurial > emacs
comparison lisp/term/x-win.el @ 89966:d8411455de48
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-32
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-486
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-487
Tweak permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-488
- 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
- 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
- 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
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-513
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 27 Aug 2004 07:00:34 +0000 |
parents | 4c90ffeb71c5 302e4e1415d3 |
children | f2ebccfa87d4 |
comparison
equal
deleted
inserted
replaced
89965:5e9097d1ad99 | 89966:d8411455de48 |
---|---|
2211 ;; If UTF8_STRING was also successful, choose the | 2211 ;; If UTF8_STRING was also successful, choose the |
2212 ;; more appropriate one from UTF8 and CTEXT. | 2212 ;; more appropriate one from UTF8 and CTEXT. |
2213 (if utf8 | 2213 (if utf8 |
2214 (setq text (x-select-utf8-or-ctext utf8 ctext)) | 2214 (setq text (x-select-utf8-or-ctext utf8 ctext)) |
2215 ;; Othewise, choose CTEXT. | 2215 ;; Othewise, choose CTEXT. |
2216 (setq text ctext)))) | 2216 (setq text ctext)) |
2217 (setq text utf8))) | |
2217 ;; If not yet decided, try STRING. | 2218 ;; If not yet decided, try STRING. |
2218 (or text | 2219 (or text |
2219 (setq text (condition-case nil | 2220 (setq text (condition-case nil |
2220 (x-get-selection type 'STRING) | 2221 (x-get-selection type 'STRING) |
2221 (error nil)))) | 2222 (error nil)))) |