diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2020-12-23 18:31:28 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2020-12-23 18:31:52 -0500 |
| commit | ccb3efffc5a41353abb6ae223a7dcff1ea20e5fb (patch) | |
| tree | e51b63f5fc84b0a31270e0ccf1506083aebbec5a | |
| parent | b68d52c81b53ebe993620e1b80a1c923987b089b (diff) | |
| download | emacs-ccb3efffc5a41353abb6ae223a7dcff1ea20e5fb.tar.gz emacs-ccb3efffc5a41353abb6ae223a7dcff1ea20e5fb.tar.bz2 emacs-ccb3efffc5a41353abb6ae223a7dcff1ea20e5fb.zip | |
* src/dispnew.c (sit_for): Fix bug#45292
When reading, prefer staying in the selected-window over preserving
the current-buffer.
| -rw-r--r-- | src/dispnew.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/dispnew.c b/src/dispnew.c index 89dd32ad0fb..e0a64761904 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -6057,6 +6057,8 @@ sit_for (Lisp_Object timeout, bool reading, int display_option) intmax_t sec; int nsec; bool do_display = display_option > 0; + bool curbuf_eq_winbuf + = (current_buffer == XBUFFER (XWINDOW (selected_window)->contents)); swallow_events (do_display); @@ -6111,6 +6113,13 @@ sit_for (Lisp_Object timeout, bool reading, int display_option) wait_reading_process_output (sec, nsec, reading ? -1 : 1, do_display, Qnil, NULL, 0); + if (reading && curbuf_eq_winbuf) + /* Timers and process filters/sentinels may have changed the selected + window (e.g. in response to a connection from emacsclient), in which + case we should follow it (unless we weren't in the selected-window's + buffer to start with). */ + set_buffer_internal (XBUFFER (XWINDOW (selected_window)->contents)); + return detect_input_pending () ? Qnil : Qt; } |