aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichael Albinus2016-04-10 10:07:15 +0200
committerMichael Albinus2016-04-10 10:07:15 +0200
commit7172ba7f7f5b1a91357ea727ab188db3ccc99a77 (patch)
tree79fb5562afac5b09e6310e4a4ab09967834e1815 /src
parent5e1c32e7916420a447b060a4ff2507364aff41a4 (diff)
downloademacs-7172ba7f7f5b1a91357ea727ab188db3ccc99a77.tar.gz
emacs-7172ba7f7f5b1a91357ea727ab188db3ccc99a77.zip
Fix Bug#23207
* src/keyboard.c (read_char): Resume idle timers in case of dbus-event, file-notify-event and config-changed-event. Reported by Johan Claesson <johanclaesson@bredband.net>. (Bug#23207)
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 6c87add5bbe..92d5c3053a7 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2834,7 +2834,16 @@ read_char (int commandflag, Lisp_Object map,
2834 last_input_event = c; 2834 last_input_event = c;
2835 call4 (Qcommand_execute, tem, Qnil, Fvector (1, &last_input_event), Qt); 2835 call4 (Qcommand_execute, tem, Qnil, Fvector (1, &last_input_event), Qt);
2836 2836
2837 if (CONSP (c) && EQ (XCAR (c), Qselect_window) && !end_time) 2837 if (CONSP (c)
2838 && (EQ (XCAR (c), Qselect_window)
2839#ifdef HAVE_DBUS
2840 || EQ (XCAR (c), Qdbus_event)
2841#endif
2842#ifdef USE_FILE_NOTIFY
2843 || EQ (XCAR (c), Qfile_notify)
2844#endif
2845 || EQ (XCAR (c), Qconfig_changed_event))
2846 && !end_time)
2838 /* We stopped being idle for this event; undo that. This 2847 /* We stopped being idle for this event; undo that. This
2839 prevents automatic window selection (under 2848 prevents automatic window selection (under
2840 mouse-autoselect-window) from acting as a real input event, for 2849 mouse-autoselect-window) from acting as a real input event, for