summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c2
2 files changed, 6 insertions, 1 deletions
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;