summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2001-03-09 14:51:01 +0000
committerGerd Moellmann <gerd@gnu.org>2001-03-09 14:51:01 +0000
commita955ffa20ce30736171729e9bac97be1beb16c3b (patch)
treeed947fd309efa774d3632990b3077e7f0bd56150 /src
parenta1b0a6dbe8fb397dc867ce72f93699d8fd0514fe (diff)
downloademacs-a955ffa20ce30736171729e9bac97be1beb16c3b.tar.gz
(make_lispy_event, make_lispy_movement): Adjust
calls to buffer_posn_from_coords to new format.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c31
1 files changed, 25 insertions, 6 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index c806bd7265e..a73936e9198 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4777,7 +4777,12 @@ make_lispy_event (event)
else if (part == 2)
posn = Qvertical_line;
else
- XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy));
+ {
+ Lisp_Object object;
+ struct display_pos p;
+ buffer_posn_from_coords (w, &wx, &wy, &object, &p);
+ posn = make_number (CHARPOS (p.pos));
+ }
}
position
@@ -5071,9 +5076,13 @@ make_lispy_event (event)
else if (part == 3)
posn = Qheader_line;
else
- XSETINT (posn,
- buffer_posn_from_coords (XWINDOW (window),
- &column, &row));
+ {
+ Lisp_Object object;
+ struct display_pos p;
+ buffer_posn_from_coords (XWINDOW (window), &column, &row,
+ &object, &p);
+ posn = make_number (CHARPOS (p.pos));
+ }
}
{
@@ -5150,7 +5159,12 @@ make_lispy_event (event)
else if (part == 3)
posn = Qheader_line;
else
- XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy));
+ {
+ Lisp_Object object;
+ struct display_pos p;
+ buffer_posn_from_coords (w, &wx, &wy, &object, &p);
+ posn = make_number (CHARPOS (p.pos));
+ }
}
{
@@ -5262,7 +5276,12 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
else if (area == 3)
posn = Qheader_line;
else
- XSETINT (posn, buffer_posn_from_coords (w, &wx, &wy));
+ {
+ Lisp_Object object;
+ struct display_pos p;
+ buffer_posn_from_coords (w, &wx, &wy, &object, &p);
+ posn = make_number (CHARPOS (p.pos));
+ }
}
else if (frame != 0)
{