Merge from emacs-23 branch

3 files changed, 23 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d81f39aa64c..66874bdb29a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-09  Chong Yidong  <cyd@stupidchicken.com>
+
+        * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec
+        (Bug#7554).
+
+2011-08-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * xt-mouse.el (xterm-mouse-event-read): Try to recover the raw
+        character.  (Bug#6594)
+
 2011-08-08  Chong Yidong  <cyd@stupidchicken.com>
 
         * image-dired.el: Don't use find-file for temporary work (Bug#7895).
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index a0b5844582b..a254abe33ac 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -461,7 +461,9 @@ interactive functions.  \(See `hi-lock-interactive-patterns'.\)
 \\<minibuffer-local-must-match-map>Use \\[minibuffer-complete] to complete a partially typed regexp.
 \(See info node `Minibuffer History'.\)"
   (interactive
-   (if (and (display-popup-menus-p) (not last-nonmenu-event))
+   (if (and (display-popup-menus-p)
+            (listp last-nonmenu-event)
+            use-dialog-box)
        (catch 'snafu
          (or
           (x-popup-menu
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 403aa5d158b..eca5f813ca2 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -120,10 +120,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."