aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2004-08-16 00:07:23 +0000
committerKenichi Handa2004-08-16 00:07:23 +0000
commitc3ff5bc11c41cbb4e6d361e38675556eb455a372 (patch)
tree3b2adbfc2a499f705ec15081e11b90bb9f78b044
parentf0d73c14e2c9b9329a86ed8092f9329823598638 (diff)
downloademacs-c3ff5bc11c41cbb4e6d361e38675556eb455a372.tar.gz
emacs-c3ff5bc11c41cbb4e6d361e38675556eb455a372.zip
term/x-win.el (x-selection-value): If utf8 was successful but
ctext was not, use utf8 string.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/term/x-win.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c10c342abe5..a3552763a8c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12004-08-15 Kenichi Handa <handa@m17n.org>
2
3 * term/x-win.el (x-selection-value): If utf8 was successful but
4 ctext was not, use utf8 string.
5
12004-08-14 Davis Herring <herring@lanl.gov> 62004-08-14 Davis Herring <herring@lanl.gov>
2 7
3 * isearch.el: Remove accidental changes of March 4. Fix backing 8 * isearch.el: Remove accidental changes of March 4. Fix backing
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index d9700809413..61602d1f355 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2212,7 +2212,8 @@ order until succeed.")
2212 (if utf8 2212 (if utf8
2213 (setq text (x-select-utf8-or-ctext utf8 ctext)) 2213 (setq text (x-select-utf8-or-ctext utf8 ctext))
2214 ;; Othewise, choose CTEXT. 2214 ;; Othewise, choose CTEXT.
2215 (setq text ctext)))) 2215 (setq text ctext))
2216 (setq text utf8)))
2216 ;; If not yet decided, try STRING. 2217 ;; If not yet decided, try STRING.
2217 (or text 2218 (or text
2218 (setq text (condition-case nil 2219 (setq text (condition-case nil