mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-30 09:00:31 -08:00
(last_point_position_buffer): New variable.
(command_loop_1): Set it. (make_lispy_movement): Don't call pixel_to_glyph_coords if FRAME is 0.
This commit is contained in:
parent
c1e6740184
commit
047688cbac
1 changed files with 9 additions and 3 deletions
|
|
@ -235,6 +235,9 @@ Lisp_Object this_command;
|
|||
/* The value of point when the last command was executed. */
|
||||
int last_point_position;
|
||||
|
||||
/* The buffer that was current when the last command was started. */
|
||||
Lisp_Object last_point_position_buffer;
|
||||
|
||||
#ifdef MULTI_FRAME
|
||||
/* The frame in which the last input event occurred, or Qmacro if the
|
||||
last event came from a macro. We use this to determine when to
|
||||
|
|
@ -1048,6 +1051,7 @@ command_loop_1 ()
|
|||
prev_buffer = current_buffer;
|
||||
prev_modiff = MODIFF;
|
||||
last_point_position = PT;
|
||||
XSET (last_point_position_buffer, Lisp_Buffer, prev_buffer);
|
||||
|
||||
/* Execute the command. */
|
||||
|
||||
|
|
@ -2767,10 +2771,12 @@ make_lispy_movement (frame, bar_window, part, x, y, time)
|
|||
Lisp_Object posn;
|
||||
int column, row;
|
||||
|
||||
pixel_to_glyph_coords (frame, XINT (x), XINT (y), &column, &row, 0, 1);
|
||||
|
||||
if (frame)
|
||||
window = window_from_coordinates (frame, column, row, &area);
|
||||
{
|
||||
/* It's in a frame; which window on that frame? */
|
||||
pixel_to_glyph_coords (frame, XINT (x), XINT (y), &column, &row, 0, 1);
|
||||
window = window_from_coordinates (frame, column, row, &area);
|
||||
}
|
||||
else
|
||||
window = Qnil;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue