aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-01-29 10:17:00 -0500
committerChong Yidong2011-01-29 10:17:00 -0500
commitb6bcd04894c08ef2ec8ad7569f028fc85793f8a6 (patch)
tree1d9ffe1301ef7cf43d1ac1f4e4eff9eba26219a2
parentbf3dae7ec340e7cb6f0dc10f76c9a19ed146fd04 (diff)
downloademacs-b6bcd04894c08ef2ec8ad7569f028fc85793f8a6.tar.gz
emacs-b6bcd04894c08ef2ec8ad7569f028fc85793f8a6.zip
* keyboard.c (make_lispy_position): Fix typo in last change (Bug#7935).
-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 @@
12011-01-29 Chong Yidong <cyd@stupidchicken.com>
2
3 * keyboard.c (make_lispy_position): Fix typo in last change
4 (Bug#7935).
5
12011-01-29 Eli Zaretskii <eliz@gnu.org> 62011-01-29 Eli Zaretskii <eliz@gnu.org>
2 7
3 * s/ms-w32.h (HAVE_MKTIME): Remove. 8 * 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,
5155 is the X coordinate relative to the text area for 5155 is the X coordinate relative to the text area for
5156 text-area and right-margin clicks, zero otherwise. */ 5156 text-area and right-margin clicks, zero otherwise. */
5157 int x2 5157 int x2
5158 = (part == ON_TEXT) ? x2 5158 = (part == ON_TEXT) ? xret
5159 : (part == ON_RIGHT_FRINGE || part == ON_RIGHT_MARGIN) 5159 : (part == ON_RIGHT_FRINGE || part == ON_RIGHT_MARGIN)
5160 ? (XINT (x) - window_box_left (w, TEXT_AREA)) 5160 ? (XINT (x) - window_box_left (w, TEXT_AREA))
5161 : 0; 5161 : 0;