Mercurial > emacs
comparison src/buffer.c @ 18751:c8135c48a66d
(set_buffer_internal_1): Convert Fset_marker argument to Lisp_Integer.
(set_buffer_temp): Likewise.
(fix_overlays_in_range): Likewise.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sat, 12 Jul 1997 06:46:48 +0000 |
| parents | 614b916ff5bf |
| children | 099aeb6bf4ea |
comparison
equal
deleted
inserted
replaced
| 18750:06cace23a912 | 18751:c8135c48a66d |
|---|---|
| 1401 when it is not current, update them now. */ | 1401 when it is not current, update them now. */ |
| 1402 if (! NILP (old_buf->pt_marker)) | 1402 if (! NILP (old_buf->pt_marker)) |
| 1403 { | 1403 { |
| 1404 Lisp_Object obuf; | 1404 Lisp_Object obuf; |
| 1405 XSETBUFFER (obuf, old_buf); | 1405 XSETBUFFER (obuf, old_buf); |
| 1406 Fset_marker (old_buf->pt_marker, BUF_PT (old_buf), obuf); | 1406 Fset_marker (old_buf->pt_marker, make_number (BUF_PT (old_buf)), |
| 1407 obuf); | |
| 1407 } | 1408 } |
| 1408 if (! NILP (old_buf->begv_marker)) | 1409 if (! NILP (old_buf->begv_marker)) |
| 1409 { | 1410 { |
| 1410 Lisp_Object obuf; | 1411 Lisp_Object obuf; |
| 1411 XSETBUFFER (obuf, old_buf); | 1412 XSETBUFFER (obuf, old_buf); |
| 1412 Fset_marker (old_buf->begv_marker, BUF_BEGV (old_buf), obuf); | 1413 Fset_marker (old_buf->begv_marker, make_number (BUF_BEGV (old_buf)), |
| 1414 obuf); | |
| 1413 } | 1415 } |
| 1414 if (! NILP (old_buf->zv_marker)) | 1416 if (! NILP (old_buf->zv_marker)) |
| 1415 { | 1417 { |
| 1416 Lisp_Object obuf; | 1418 Lisp_Object obuf; |
| 1417 XSETBUFFER (obuf, old_buf); | 1419 XSETBUFFER (obuf, old_buf); |
| 1418 Fset_marker (old_buf->zv_marker, BUF_ZV (old_buf), obuf); | 1420 Fset_marker (old_buf->zv_marker, make_number (BUF_ZV (old_buf)), |
| 1421 obuf); | |
| 1419 } | 1422 } |
| 1420 } | 1423 } |
| 1421 | 1424 |
| 1422 /* Get the undo list from the base buffer, so that it appears | 1425 /* Get the undo list from the base buffer, so that it appears |
| 1423 that an indirect buffer shares the undo list of its base. */ | 1426 that an indirect buffer shares the undo list of its base. */ |
| 1485 when it is not current, update them now. */ | 1488 when it is not current, update them now. */ |
| 1486 if (! NILP (old_buf->pt_marker)) | 1489 if (! NILP (old_buf->pt_marker)) |
| 1487 { | 1490 { |
| 1488 Lisp_Object obuf; | 1491 Lisp_Object obuf; |
| 1489 XSETBUFFER (obuf, old_buf); | 1492 XSETBUFFER (obuf, old_buf); |
| 1490 Fset_marker (old_buf->pt_marker, BUF_PT (old_buf), obuf); | 1493 Fset_marker (old_buf->pt_marker, make_number (BUF_PT (old_buf)), |
| 1494 obuf); | |
| 1491 } | 1495 } |
| 1492 if (! NILP (old_buf->begv_marker)) | 1496 if (! NILP (old_buf->begv_marker)) |
| 1493 { | 1497 { |
| 1494 Lisp_Object obuf; | 1498 Lisp_Object obuf; |
| 1495 XSETBUFFER (obuf, old_buf); | 1499 XSETBUFFER (obuf, old_buf); |
| 1496 Fset_marker (old_buf->begv_marker, BUF_BEGV (old_buf), obuf); | 1500 Fset_marker (old_buf->begv_marker, make_number (BUF_BEGV (old_buf)), |
| 1501 obuf); | |
| 1497 } | 1502 } |
| 1498 if (! NILP (old_buf->zv_marker)) | 1503 if (! NILP (old_buf->zv_marker)) |
| 1499 { | 1504 { |
| 1500 Lisp_Object obuf; | 1505 Lisp_Object obuf; |
| 1501 XSETBUFFER (obuf, old_buf); | 1506 XSETBUFFER (obuf, old_buf); |
| 1502 Fset_marker (old_buf->zv_marker, BUF_ZV (old_buf), obuf); | 1507 Fset_marker (old_buf->zv_marker, make_number (BUF_ZV (old_buf)), |
| 1508 obuf); | |
| 1503 } | 1509 } |
| 1504 } | 1510 } |
| 1505 | 1511 |
| 1506 /* If the new current buffer has markers to record PT, BEGV and ZV | 1512 /* If the new current buffer has markers to record PT, BEGV and ZV |
| 1507 when it is not current, fetch them now. */ | 1513 when it is not current, fetch them now. */ |
| 2523 { | 2529 { |
| 2524 /* If the overlay is backwards, fix that now. */ | 2530 /* If the overlay is backwards, fix that now. */ |
| 2525 if (startpos > endpos) | 2531 if (startpos > endpos) |
| 2526 { | 2532 { |
| 2527 int tem; | 2533 int tem; |
| 2528 Fset_marker (OVERLAY_START (overlay), endpos, Qnil); | 2534 Fset_marker (OVERLAY_START (overlay), make_number (endpos), |
| 2529 Fset_marker (OVERLAY_END (overlay), startpos, Qnil); | 2535 Qnil); |
| 2536 Fset_marker (OVERLAY_END (overlay), make_number (startpos), | |
| 2537 Qnil); | |
| 2530 tem = startpos; startpos = endpos; endpos = tem; | 2538 tem = startpos; startpos = endpos; endpos = tem; |
| 2531 } | 2539 } |
| 2532 /* Add it to the end of the wrong list. Later on, | 2540 /* Add it to the end of the wrong list. Later on, |
| 2533 recenter_overlay_lists will move it to the right place. */ | 2541 recenter_overlay_lists will move it to the right place. */ |
| 2534 if (endpos < XINT (current_buffer->overlay_center)) | 2542 if (endpos < XINT (current_buffer->overlay_center)) |
| 2557 || (endpos >= start && endpos < end)) | 2565 || (endpos >= start && endpos < end)) |
| 2558 { | 2566 { |
| 2559 if (startpos > endpos) | 2567 if (startpos > endpos) |
| 2560 { | 2568 { |
| 2561 int tem; | 2569 int tem; |
| 2562 Fset_marker (OVERLAY_START (overlay), endpos, Qnil); | 2570 Fset_marker (OVERLAY_START (overlay), make_number (endpos), |
| 2563 Fset_marker (OVERLAY_END (overlay), startpos, Qnil); | 2571 Qnil); |
| 2572 Fset_marker (OVERLAY_END (overlay), make_number (startpos), | |
| 2573 Qnil); | |
| 2564 tem = startpos; startpos = endpos; endpos = tem; | 2574 tem = startpos; startpos = endpos; endpos = tem; |
| 2565 } | 2575 } |
| 2566 if (endpos < XINT (current_buffer->overlay_center)) | 2576 if (endpos < XINT (current_buffer->overlay_center)) |
| 2567 { | 2577 { |
| 2568 *pafter = *ptail; | 2578 *pafter = *ptail; |