diff options
| author | Paul Eggert | 2016-04-03 13:39:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-04-03 13:39:52 -0700 |
| commit | 969c8a388a859e4366a1fe75ae57939a765874aa (patch) | |
| tree | 9c27ce32caf0b22e21ec103812e3bf4350627afc /src | |
| parent | 368cb23fe249334bf9d230755ae07b6410ac6852 (diff) | |
| parent | 787df9dd053581b7e15fb0cd1ee3e9a17dbd1ad7 (diff) | |
| download | emacs-969c8a388a859e4366a1fe75ae57939a765874aa.tar.gz emacs-969c8a388a859e4366a1fe75ae57939a765874aa.zip | |
Merge from origin/emacs-25
787df9d ; * src/keyboard.c (read_char): Fix typos in a comment.
Diffstat (limited to 'src')
| -rw-r--r-- | src/keyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 54643eebba4..6c87add5bbe 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -2837,7 +2837,7 @@ read_char (int commandflag, Lisp_Object map, | |||
| 2837 | if (CONSP (c) && EQ (XCAR (c), Qselect_window) && !end_time) | 2837 | if (CONSP (c) && EQ (XCAR (c), Qselect_window) && !end_time) |
| 2838 | /* We stopped being idle for this event; undo that. This | 2838 | /* We stopped being idle for this event; undo that. This |
| 2839 | prevents automatic window selection (under | 2839 | prevents automatic window selection (under |
| 2840 | mouse_autoselect_window from acting as a real input event, for | 2840 | mouse-autoselect-window) from acting as a real input event, for |
| 2841 | example banishing the mouse under mouse-avoidance-mode. */ | 2841 | example banishing the mouse under mouse-avoidance-mode. */ |
| 2842 | timer_resume_idle (); | 2842 | timer_resume_idle (); |
| 2843 | 2843 | ||