comparison src/undo.c @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28
author cvs
date Mon, 13 Aug 2007 11:33:38 +0200
parents 3ecd8885ac67
children 183866b06e0b
comparison
equal deleted inserted replaced
439:357dd071b03c 440:8de8e3f6228a
279 If the first element is an undo boundary, skip past it. */ 279 If the first element is an undo boundary, skip past it. */
280 if (CONSP (next) 280 if (CONSP (next)
281 && NILP (XCAR (next))) 281 && NILP (XCAR (next)))
282 { 282 {
283 /* Add in the space occupied by this element and its chain link. */ 283 /* Add in the space occupied by this element and its chain link. */
284 size_so_far += sizeof (struct Lisp_Cons); 284 size_so_far += sizeof (Lisp_Cons);
285 285
286 /* Advance to next element. */ 286 /* Advance to next element. */
287 prev = next; 287 prev = next;
288 next = XCDR (next); 288 next = XCDR (next);
289 } 289 }
292 { 292 {
293 Lisp_Object elt; 293 Lisp_Object elt;
294 elt = XCAR (next); 294 elt = XCAR (next);
295 295
296 /* Add in the space occupied by this element and its chain link. */ 296 /* Add in the space occupied by this element and its chain link. */
297 size_so_far += sizeof (struct Lisp_Cons); 297 size_so_far += sizeof (Lisp_Cons);
298 if (CONSP (elt)) 298 if (CONSP (elt))
299 { 299 {
300 size_so_far += sizeof (struct Lisp_Cons); 300 size_so_far += sizeof (Lisp_Cons);
301 if (STRINGP (XCAR (elt))) 301 if (STRINGP (XCAR (elt)))
302 size_so_far += (sizeof (struct Lisp_String) - 1 302 size_so_far += (sizeof (Lisp_String) - 1
303 + XSTRING_LENGTH (XCAR (elt))); 303 + XSTRING_LENGTH (XCAR (elt)));
304 } 304 }
305 305
306 /* Advance to next element. */ 306 /* Advance to next element. */
307 prev = next; 307 prev = next;
327 if (size_so_far > minsize && minsize > 0) 327 if (size_so_far > minsize && minsize > 0)
328 break; 328 break;
329 } 329 }
330 330
331 /* Add in the space occupied by this element and its chain link. */ 331 /* Add in the space occupied by this element and its chain link. */
332 size_so_far += sizeof (struct Lisp_Cons); 332 size_so_far += sizeof (Lisp_Cons);
333 if (CONSP (elt)) 333 if (CONSP (elt))
334 { 334 {
335 size_so_far += sizeof (struct Lisp_Cons); 335 size_so_far += sizeof (Lisp_Cons);
336 if (STRINGP (XCAR (elt))) 336 if (STRINGP (XCAR (elt)))
337 size_so_far += (sizeof (struct Lisp_String) - 1 337 size_so_far += (sizeof (Lisp_String) - 1
338 + XSTRING_LENGTH (XCAR (elt))); 338 + XSTRING_LENGTH (XCAR (elt)));
339 } 339 }
340 340
341 /* Advance to next element. */ 341 /* Advance to next element. */
342 prev = next; 342 prev = next;