aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2006-08-27 07:09:06 +0000
committerYAMAMOTO Mitsuharu2006-08-27 07:09:06 +0000
commitcc4d4639cfd7491eafb5e2e815bf3bf6382e3d2f (patch)
treeee789ae454e15b64ee310fec8ffc318a7455c473
parentedc52b3fa1c83b8bab4004b4721cad9afb0563aa (diff)
downloademacs-cc4d4639cfd7491eafb5e2e815bf3bf6382e3d2f.tar.gz
emacs-cc4d4639cfd7491eafb5e2e815bf3bf6382e3d2f.zip
(in_sighandler): Remove variable.
(Fcurrent_idle_time): Add missing `doc:'. (input_available_signal, init_keyboard): Undo previous change.
-rw-r--r--src/keyboard.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index abf57937966..662aacf91a6 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -100,14 +100,6 @@ int interrupt_input_pending;
100/* File descriptor to use for input. */ 100/* File descriptor to use for input. */
101extern int input_fd; 101extern int input_fd;
102 102
103/* Nonzero if we are executing from the SIGIO signal handler.
104 The difference between in_sighandler and handling_signal is that
105 in_sighandler is only set when executing in a signal handler.
106 handling_signal may be set even if not executing in a signal handler, for
107 example when reinvoke_input_signal is called from UNBLOCK_INPUT, or
108 when Emacs is compiled with SYNC_INPUT defined. */
109int in_sighandler;
110
111#ifdef HAVE_WINDOW_SYSTEM 103#ifdef HAVE_WINDOW_SYSTEM
112/* Make all keyboard buffers much bigger when using X windows. */ 104/* Make all keyboard buffers much bigger when using X windows. */
113#ifdef MAC_OS8 105#ifdef MAC_OS8
@@ -4560,7 +4552,7 @@ timer_check (do_it_now)
4560} 4552}
4561 4553
4562DEFUN ("current-idle-time", Fcurrent_idle_time, Scurrent_idle_time, 0, 0, 0, 4554DEFUN ("current-idle-time", Fcurrent_idle_time, Scurrent_idle_time, 0, 0, 0,
4563 /* Return the current length of Emacs idleness. 4555 doc: /* Return the current length of Emacs idleness.
4564The value is returned as a list of three integers. The first has the 4556The value is returned as a list of three integers. The first has the
4565most significant 16 bits of the seconds, while the second has the 4557most significant 16 bits of the seconds, while the second has the
4566least significant 16 bits. The third integer gives the microsecond 4558least significant 16 bits. The third integer gives the microsecond
@@ -6977,8 +6969,6 @@ input_available_signal (signo)
6977 SIGNAL_THREAD_CHECK (signo); 6969 SIGNAL_THREAD_CHECK (signo);
6978#endif 6970#endif
6979 6971
6980 in_sighandler = 1;
6981
6982 if (input_available_clear_time) 6972 if (input_available_clear_time)
6983 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); 6973 EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0);
6984 6974
@@ -6990,7 +6980,6 @@ input_available_signal (signo)
6990 sigfree (); 6980 sigfree ();
6991#endif 6981#endif
6992 errno = old_errno; 6982 errno = old_errno;
6993 in_sighandler = 0;
6994} 6983}
6995#endif /* SIGIO */ 6984#endif /* SIGIO */
6996 6985
@@ -10858,7 +10847,6 @@ init_keyboard ()
10858 do_mouse_tracking = Qnil; 10847 do_mouse_tracking = Qnil;
10859#endif 10848#endif
10860 input_pending = 0; 10849 input_pending = 0;
10861 in_sighandler = 0;
10862 10850
10863 /* This means that command_loop_1 won't try to select anything the first 10851 /* This means that command_loop_1 won't try to select anything the first
10864 time through. */ 10852 time through. */