From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 29 Jan 2011 15:17:00 +0000 (-0500)
Subject: * keyboard.c (make_lispy_position): Fix typo in last change (Bug#7935).
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~79
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6bcd04894c08ef2ec8ad7569f028fc85793f8a6;p=emacs.git

* keyboard.c (make_lispy_position): Fix typo in last change (Bug#7935).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f19b02ef38..0c562f87994 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-29  Chong Yidong  <cyd@stupidchicken.com>
+
+	* keyboard.c (make_lispy_position): Fix typo in last change
+	(Bug#7935).
+
 2011-01-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* s/ms-w32.h (HAVE_MKTIME): Remove.
diff --git a/src/keyboard.c b/src/keyboard.c
index 7a5185d43da..3283fd4dfe4 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5155,7 +5155,7 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
 	     is the X coordinate relative to the text area for
 	     text-area and right-margin clicks, zero otherwise.  */
 	  int x2
-	    = (part == ON_TEXT) ? x2
+	    = (part == ON_TEXT) ? xret
 	    : (part == ON_RIGHT_FRINGE || part == ON_RIGHT_MARGIN)
 	    ? (XINT (x) - window_box_left (w, TEXT_AREA))
 	    : 0;