diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2022-10-30 18:45:37 +0100 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2022-10-30 18:45:37 +0100 |
| commit | 2a4f37fe520b4f18295cff6671f289a47c1578df (patch) | |
| tree | 6061489df433080d5a3da4a8eb33fd269d2bcb95 /src/keyboard.c | |
| parent | d33998ed3b5e05a40b9c4c1799b6e911b582ef01 (diff) | |
| parent | 3fa4cca3d244f51e471e7779c934278731fc21e9 (diff) | |
| download | emacs-2a4f37fe520b4f18295cff6671f289a47c1578df.tar.gz | |
Merge remote-tracking branch 'origin/master' into feature/package+vc
Diffstat (limited to 'src/keyboard.c')
| -rw-r--r-- | src/keyboard.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 224512bfc92..069cf0627b2 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1270,7 +1270,6 @@ command_loop_1 (void) { modiff_count prev_modiff = 0; struct buffer *prev_buffer = NULL; - bool already_adjusted = 0; kset_prefix_arg (current_kboard, Qnil); kset_last_prefix_arg (current_kboard, Qnil); @@ -1460,8 +1459,6 @@ command_loop_1 (void) safe_run_hooks_maybe_narrowed (Qpre_command_hook, XWINDOW (selected_window)); - already_adjusted = 0; - if (NILP (Vthis_command)) /* nil means key is undefined. */ call0 (Qundefined); @@ -1617,9 +1614,8 @@ command_loop_1 (void) the automatic composition, we must update the display. */ windows_or_buffers_changed = 21; - if (!already_adjusted) - adjust_point_for_property (last_point_position, - MODIFF != prev_modiff); + adjust_point_for_property (last_point_position, + MODIFF != prev_modiff); } else if (PT > BEGV && PT < ZV && (composition_adjust_point (last_point_position, PT) @@ -1701,8 +1697,8 @@ adjust_point_for_property (ptrdiff_t last_pt, bool modified) && display_prop_intangible_p (val, overlay, PT, PT_BYTE) && (!OVERLAYP (overlay) ? get_property_and_range (PT, Qdisplay, &val, &beg, &end, Qnil) - : (beg = OVERLAY_POSITION (OVERLAY_START (overlay)), - end = OVERLAY_POSITION (OVERLAY_END (overlay)))) + : (beg = OVERLAY_START (overlay), + end = OVERLAY_END (overlay))) && (beg < PT /* && end > PT <- It's always the case. */ || (beg <= PT && STRINGP (val) && SCHARS (val) == 0))) { |