* term/x-win.el (x-select-text, x-cut-buffer-or-selection-value):

 Encode/decode text to/from cut buffers to/from iso-latin-1 only.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index add015be455a424485cfb96561285f6bdcbc9497..b13d618af880d2d800e1682c6bfd2e709ce33411 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-10  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * term/x-win.el (x-select-text, x-cut-buffer-or-selection-value): 
+       Encode/decode text to/from cut buffers to/from iso-latin-1 only.
+
 2006-11-10  Juanma Barranquero  <lekktu@gmail.com>
 
        * bs.el (bs--window-for-buffer): Remove.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 69bc9b10d78dfabf34d4067e0f73fb6f28b0032e..0e68fa575eb9155616ccd347241910c33494666c 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -2164,8 +2164,8 @@ in the clipboard."
        (t
         (setq x-last-selected-text-cut text
               x-last-selected-text-cut-encoded
-              (encode-coding-string text (or locale-coding-system
-                                             'iso-latin-1)))
+              ;; ICCCM says cut buffer always contain ISO-Latin-1
+              (encode-coding-string text 'iso-latin-1))
         (x-set-cut-buffer x-last-selected-text-cut-encoded push)))
   (x-set-selection 'PRIMARY text)
   (setq x-last-selected-text-primary text)
@@ -2346,8 +2346,8 @@ order until succeed.")
           (t
            (setq x-last-selected-text-cut-encoded cut-text
                  x-last-selected-text-cut
-                 (decode-coding-string cut-text (or locale-coding-system
-                                                    'iso-latin-1))))))
+                 ;; ICCCM says cut buffer always contain ISO-Latin-1
+                 (decode-coding-string cut-text 'iso-latin-1)))))
 
     ;; As we have done one selection, clear this now.
     (setq next-selection-coding-system nil)