aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKenichi Handa <[email protected]>2004-08-16 00:07:23 +0000
committerKenichi Handa <[email protected]>2004-08-16 00:07:23 +0000
commitc3ff5bc11c41cbb4e6d361e38675556eb455a372 (patch)
tree3b2adbfc2a499f705ec15081e11b90bb9f78b044 /lisp
parentf0d73c14e2c9b9329a86ed8092f9329823598638 (diff)
term/x-win.el (x-selection-value): If utf8 was successful but
ctext was not, use utf8 string.
Diffstat (limited to 'lisp')
-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 c10c342abe..a3552763a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-15 Kenichi Handa <[email protected]>
+
+ * term/x-win.el (x-selection-value): If utf8 was successful but
+ ctext was not, use utf8 string.
+
2004-08-14 Davis Herring <[email protected]>
* 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 d970080941..61602d1f35 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2212,7 +2212,8 @@ order until succeed.")
(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