aboutsummaryrefslogtreecommitdiffstats
path: root/src/keyboard.c
diff options
context:
space:
mode:
authorJuanma Barranquero2011-09-09 03:06:52 +0200
committerJuanma Barranquero2011-09-09 03:06:52 +0200
commit5e617bc2b62189768814fafd1a875e89a094d3ef (patch)
treed96d22e012035d044557abf4de0b8e30b03d61b7 /src/keyboard.c
parent9b1c252e294bed3aef0d2f2fc5d1fa9f72df9ee8 (diff)
downloademacs-5e617bc2b62189768814fafd1a875e89a094d3ef.tar.gz
emacs-5e617bc2b62189768814fafd1a875e89a094d3ef.zip
Whitespace changes.
Diffstat (limited to 'src/keyboard.c')
-rw-r--r--src/keyboard.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 51eac369e7c..26407785c86 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -408,7 +408,7 @@ int interrupts_deferred;
408 408
409/* If we support a window system, turn on the code to poll periodically 409/* If we support a window system, turn on the code to poll periodically
410 to detect C-g. It isn't actually used when doing interrupt input. */ 410 to detect C-g. It isn't actually used when doing interrupt input. */
411#if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS) 411#if defined (HAVE_WINDOW_SYSTEM) && !defined (USE_ASYNC_EVENTS)
412#define POLL_FOR_INPUT 412#define POLL_FOR_INPUT
413#endif 413#endif
414 414
@@ -3955,7 +3955,7 @@ kbd_buffer_get_event (KBOARD **kbp,
3955 kbd_fetch_ptr = event + 1; 3955 kbd_fetch_ptr = event + 1;
3956 } 3956 }
3957#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ 3957#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
3958 || defined(HAVE_NS) || defined (USE_GTK) 3958 || defined (HAVE_NS) || defined (USE_GTK)
3959 else if (event->kind == MENU_BAR_ACTIVATE_EVENT) 3959 else if (event->kind == MENU_BAR_ACTIVATE_EVENT)
3960 { 3960 {
3961 kbd_fetch_ptr = event + 1; 3961 kbd_fetch_ptr = event + 1;
@@ -4065,7 +4065,7 @@ kbd_buffer_get_event (KBOARD **kbp,
4065 obj = make_lispy_event (event); 4065 obj = make_lispy_event (event);
4066 4066
4067#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ 4067#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
4068 || defined(HAVE_NS) || defined (USE_GTK) 4068 || defined (HAVE_NS) || defined (USE_GTK)
4069 /* If this was a menu selection, then set the flag to inhibit 4069 /* If this was a menu selection, then set the flag to inhibit
4070 writing to last_nonmenu_event. Don't do this if the event 4070 writing to last_nonmenu_event. Don't do this if the event
4071 we're returning is (menu-bar), though; that indicates the 4071 we're returning is (menu-bar), though; that indicates the
@@ -5881,7 +5881,7 @@ make_lispy_event (struct input_event *event)
5881#endif /* HAVE_MOUSE */ 5881#endif /* HAVE_MOUSE */
5882 5882
5883#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \ 5883#if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) \
5884 || defined(HAVE_NS) || defined (USE_GTK) 5884 || defined (HAVE_NS) || defined (USE_GTK)
5885 case MENU_BAR_EVENT: 5885 case MENU_BAR_EVENT:
5886 if (EQ (event->arg, event->frame_or_window)) 5886 if (EQ (event->arg, event->frame_or_window))
5887 /* This is the prefix key. We translate this to 5887 /* This is the prefix key. We translate this to
@@ -5996,7 +5996,7 @@ make_lispy_event (struct input_event *event)
5996 } 5996 }
5997} 5997}
5998 5998
5999#if defined(HAVE_MOUSE) || defined(HAVE_GPM) 5999#if defined (HAVE_MOUSE) || defined (HAVE_GPM)
6000 6000
6001static Lisp_Object 6001static Lisp_Object
6002make_lispy_movement (FRAME_PTR frame, Lisp_Object bar_window, enum scroll_bar_part part, 6002make_lispy_movement (FRAME_PTR frame, Lisp_Object bar_window, enum scroll_bar_part part,
@@ -7008,7 +7008,7 @@ tty_read_avail_input (struct terminal *terminal,
7008 if (n_to_read > sizeof cbuf) 7008 if (n_to_read > sizeof cbuf)
7009 n_to_read = sizeof cbuf; 7009 n_to_read = sizeof cbuf;
7010#else /* no FIONREAD */ 7010#else /* no FIONREAD */
7011#if defined (USG) || defined(CYGWIN) 7011#if defined (USG) || defined (CYGWIN)
7012 /* Read some input if available, but don't wait. */ 7012 /* Read some input if available, but don't wait. */
7013 n_to_read = sizeof cbuf; 7013 n_to_read = sizeof cbuf;
7014 fcntl (fileno (tty->input), F_SETFL, O_NDELAY); 7014 fcntl (fileno (tty->input), F_SETFL, O_NDELAY);