[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 969c8a3 3/3: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 969c8a3 3/3: Merge from origin/emacs-25 |
Date: |
Sun, 03 Apr 2016 20:42:53 +0000 |
branch: master
commit 969c8a388a859e4366a1fe75ae57939a765874aa
Merge: 368cb23 787df9d
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
787df9d ; * src/keyboard.c (read_char): Fix typos in a comment.
---
src/keyboard.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/keyboard.c b/src/keyboard.c
index 54643ee..6c87add 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2837,7 +2837,7 @@ read_char (int commandflag, Lisp_Object map,
if (CONSP (c) && EQ (XCAR (c), Qselect_window) && !end_time)
/* We stopped being idle for this event; undo that. This
prevents automatic window selection (under
- mouse_autoselect_window from acting as a real input event, for
+ mouse-autoselect-window) from acting as a real input event, for
example banishing the mouse under mouse-avoidance-mode. */
timer_resume_idle ();