comparison src/event-stream.c @ 446:1ccc32a20af4 r21-2-38

Import from CVS: tag r21-2-38
author cvs
date Mon, 13 Aug 2007 11:37:21 +0200
parents 576fb035e263
children 3d3049ae1304
comparison
equal deleted inserted replaced
445:34f3776fcf0e 446:1ccc32a20af4
3370 /* Create the keys ring vector, if none present. */ 3370 /* Create the keys ring vector, if none present. */
3371 if (NILP (Vrecent_keys_ring)) 3371 if (NILP (Vrecent_keys_ring))
3372 { 3372 {
3373 Vrecent_keys_ring = make_vector (recent_keys_ring_size, Qnil); 3373 Vrecent_keys_ring = make_vector (recent_keys_ring_size, Qnil);
3374 /* And return nothing in particular. */ 3374 /* And return nothing in particular. */
3375 return make_vector (0, Qnil); 3375 RETURN_UNGCPRO (make_vector (0, Qnil));
3376 } 3376 }
3377 3377
3378 if (NILP (XVECTOR_DATA (Vrecent_keys_ring)[recent_keys_ring_index])) 3378 if (NILP (XVECTOR_DATA (Vrecent_keys_ring)[recent_keys_ring_index]))
3379 /* This means the vector has not yet wrapped */ 3379 /* This means the vector has not yet wrapped */
3380 { 3380 {
3428 (size)) 3428 (size))
3429 { 3429 {
3430 Lisp_Object new_vector = Qnil; 3430 Lisp_Object new_vector = Qnil;
3431 int i, j, nkeys, start, min; 3431 int i, j, nkeys, start, min;
3432 struct gcpro gcpro1; 3432 struct gcpro gcpro1;
3433 GCPRO1 (new_vector);
3434 3433
3435 CHECK_INT (size); 3434 CHECK_INT (size);
3436 if (XINT (size) <= 0) 3435 if (XINT (size) <= 0)
3437 error ("Recent keys ring size must be positive"); 3436 error ("Recent keys ring size must be positive");
3438 if (XINT (size) == recent_keys_ring_size) 3437 if (XINT (size) == recent_keys_ring_size)
3439 return size; 3438 return size;
3440 3439
3440 GCPRO1 (new_vector);
3441 new_vector = make_vector (XINT (size), Qnil); 3441 new_vector = make_vector (XINT (size), Qnil);
3442 3442
3443 if (NILP (Vrecent_keys_ring)) 3443 if (NILP (Vrecent_keys_ring))
3444 { 3444 {
3445 Vrecent_keys_ring = new_vector; 3445 Vrecent_keys_ring = new_vector;
3446 return size; 3446 RETURN_UNGCPRO (size);
3447 } 3447 }
3448 3448
3449 if (NILP (XVECTOR_DATA (Vrecent_keys_ring)[recent_keys_ring_index])) 3449 if (NILP (XVECTOR_DATA (Vrecent_keys_ring)[recent_keys_ring_index]))
3450 /* This means the vector has not yet wrapped */ 3450 /* This means the vector has not yet wrapped */
3451 { 3451 {