comparison src/event-stream.c @ 5126:2a462149bd6a ben-lisp-object

merge
author Ben Wing <ben@xemacs.org>
date Wed, 24 Feb 2010 19:04:27 -0600
parents b5df3737028a 6f2158fa75ed
children a9c41067dd88
comparison
equal deleted inserted replaced
5125:b5df3737028a 5126:2a462149bd6a
1291 lisp_number_to_milliseconds (resignal, 0)); 1291 lisp_number_to_milliseconds (resignal, 0));
1292 int id; 1292 int id;
1293 Lisp_Object lid; 1293 Lisp_Object lid;
1294 id = event_stream_generate_wakeup (msecs, msecs2, function, object, 0); 1294 id = event_stream_generate_wakeup (msecs, msecs2, function, object, 0);
1295 lid = make_int (id); 1295 lid = make_int (id);
1296 if (id != XINT (lid)) ABORT (); 1296 assert (id == XINT (lid));
1297 return lid; 1297 return lid;
1298 } 1298 }
1299 1299
1300 DEFUN ("disable-timeout", Fdisable_timeout, 1, 1, 0, /* 1300 DEFUN ("disable-timeout", Fdisable_timeout, 1, 1, 0, /*
1301 Disable a timeout from signalling any more. 1301 Disable a timeout from signalling any more.
1370 lisp_number_to_milliseconds (resignal, 0)); 1370 lisp_number_to_milliseconds (resignal, 0));
1371 int id; 1371 int id;
1372 Lisp_Object lid; 1372 Lisp_Object lid;
1373 id = event_stream_generate_wakeup (msecs, msecs2, function, object, 1); 1373 id = event_stream_generate_wakeup (msecs, msecs2, function, object, 1);
1374 lid = make_int (id); 1374 lid = make_int (id);
1375 if (id != XINT (lid)) ABORT (); 1375 assert (id == XINT (lid));
1376 return lid; 1376 return lid;
1377 } 1377 }
1378 1378
1379 DEFUN ("disable-async-timeout", Fdisable_async_timeout, 1, 1, 0, /* 1379 DEFUN ("disable-async-timeout", Fdisable_async_timeout, 1, 1, 0, /*
1380 Disable an asynchronous timeout from signalling any more. 1380 Disable an asynchronous timeout from signalling any more.
3740 3740
3741 for (i = 0, j = start; i < nkeys; i++) 3741 for (i = 0, j = start; i < nkeys; i++)
3742 { 3742 {
3743 Lisp_Object e = XVECTOR_DATA (Vrecent_keys_ring)[j]; 3743 Lisp_Object e = XVECTOR_DATA (Vrecent_keys_ring)[j];
3744 3744
3745 if (NILP (e)) 3745 assert (!NILP (e));
3746 ABORT ();
3747 XVECTOR_DATA (val)[i] = Fcopy_event (e, Qnil); 3746 XVECTOR_DATA (val)[i] = Fcopy_event (e, Qnil);
3748 if (++j >= recent_keys_ring_size) 3747 if (++j >= recent_keys_ring_size)
3749 j = 0; 3748 j = 0;
3750 } 3749 }
3751 UNGCPRO; 3750 UNGCPRO;