aboutsummaryrefslogtreecommitdiffstats
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorJoakim Verona2012-01-12 07:50:16 +0100
committerJoakim Verona2012-01-12 07:50:16 +0100
commit16e9a80c0c3ca5f72f802b92ff5ca1f595a07eca (patch)
tree33fb6b970b7bcb0cb813d305da2c43f3d212bbf2 /src/keyboard.c
parente4f761f1e3df7fbc7793c73c5d808b8da0b3a700 (diff)
parent403993a8a646887193dd7b8a01cf16137cd89a1e (diff)
downloademacs-16e9a80c0c3ca5f72f802b92ff5ca1f595a07eca.tar.gz
emacs-16e9a80c0c3ca5f72f802b92ff5ca1f595a07eca.zip
upstream
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 394f95bd07c..12eb162df9a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2242,8 +2242,8 @@ do { if (polling_stopped_here) start_polling (); \
2242 polling_stopped_here = 0; } while (0) 2242 polling_stopped_here = 0; } while (0)
2243 2243
2244/* read a character from the keyboard; call the redisplay if needed */ 2244/* read a character from the keyboard; call the redisplay if needed */
2245/* commandflag 0 means do not do auto-saving, but do do redisplay. 2245/* commandflag 0 means do not autosave, but do redisplay.
2246 -1 means do not do redisplay, but do do autosaving. 2246 -1 means do not redisplay, but do autosave.
2247 1 means do both. */ 2247 1 means do both. */
2248 2248
2249/* The arguments MAPS and NMAPS are for menu prompting. 2249/* The arguments MAPS and NMAPS are for menu prompting.
@@ -5143,7 +5143,7 @@ make_lispy_position (struct frame *f, Lisp_Object x, Lisp_Object y,
5143 5143
5144 if (WINDOWP (window)) 5144 if (WINDOWP (window))
5145 { 5145 {
5146 /* It's a click in window window at frame coordinates (x,y) */ 5146 /* It's a click in window WINDOW at frame coordinates (X,Y) */
5147 struct window *w = XWINDOW (window); 5147 struct window *w = XWINDOW (window);
5148 Lisp_Object string_info = Qnil; 5148 Lisp_Object string_info = Qnil;
5149 EMACS_INT textpos = -1; 5149 EMACS_INT textpos = -1;