From: Andreas Schwab <schwab@suse.de>
Date: Mon, 24 Mar 2008 09:28:05 +0000 (+0000)
Subject: (xterm-mouse-event): Avoid error with buttons > 5.
X-Git-Tag: emacs-pretest-23.0.90~6961
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=318f2a46e093827563af5e297178bb8fb098a3b8;p=emacs.git

(xterm-mouse-event): Avoid error with buttons > 5.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 013080db8cc..8b4038e1b23 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-24  Andreas Schwab  <schwab@suse.de>
+
+	* xt-mouse.el (xterm-mouse-event): Avoid error with buttons > 5.
+
 2008-03-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* vc-hg.el (vc-hg-after-dir-status):
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 5109596527b..5f8d8ca61db 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -168,7 +168,10 @@
 		       ((= type 11)
 			(format "mouse-%d" (- xterm-mouse-last 7)))
 		       ((= type 3)
-			(format "mouse-%d" (+ 1 xterm-mouse-last)))
+			;; For buttons > 5 xterm only reports a
+			;; button-release event.  Avoid error by mapping
+			;; them all to mouse-1.
+			(format "mouse-%d" (+ 1 (or xterm-mouse-last 0))))
 		       (t
 			(setq xterm-mouse-last type)
 			(format "down-mouse-%d" (+ 1 type))))))