changeset 73862:80f02ad4de5e

* 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.
author Jan Djärv <jan.h.d@swipnet.se>
date Fri, 10 Nov 2006 07:40:06 +0000
parents e456c2727989
children bf62fb0d4b65
files lisp/ChangeLog lisp/term/x-win.el
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Nov 10 07:39:08 2006 +0000
+++ b/lisp/ChangeLog	Fri Nov 10 07:40:06 2006 +0000
@@ -1,3 +1,8 @@
+2006-11-10  Jan Dj,Ad(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.
--- a/lisp/term/x-win.el	Fri Nov 10 07:39:08 2006 +0000
+++ b/lisp/term/x-win.el	Fri Nov 10 07:40:06 2006 +0000
@@ -2164,8 +2164,8 @@
 	(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 @@
 	   (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)