2 files changed, 15 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1b401bf7582..a42c0127ff5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * xt-mouse.el (xterm-mouse-event-read): Try to recover the raw
+        character.  (Bug#6594)
+
 2011-07-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * window.el (split-window-horizontally): Doc fix (Bug#9060).
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 5a70e6a6808..f917287d2d9 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -121,10 +121,17 @@
 
 ;; read xterm sequences above ascii 127 (#x7f)
 (defun xterm-mouse-event-read ()
+  ;; We get the characters decoded by the keyboard coding system.  Try
+  ;; to recover the raw character.
   (let ((c (read-char)))
-    (if (> c #x3FFF80)
-        (+ 128 (- c #x3FFF80))
-      c)))
+    (cond ;; If meta-flag is t we get a meta character
+          ((>= c ?\M-\^@)
+           (- c (- ?\M-\^@ 128)))
+          ;; Reencode the character in the keyboard coding system, if
+          ;; this is a non-ASCII character.
+          ((>= c #x80)
+           (aref (encode-coding-string (string c) (keyboard-coding-system)) 0))
+          (t c))))
 
 (defun xterm-mouse-truncate-wrap (f)
   "Truncate with wrap-around."