Mercurial > emacs

comparison src/marker.c @ 40656:cdfd4d09b79a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update usage of CHECK_ macros (remove unused second argument).
author Pavel Jan?k <Pavel@Janik.cz>
date Fri, 02 Nov 2001 20:46:55 +0000
parents 440be654a370
children 23d7de34a596
comparison
equal deleted inserted replaced
40655:45453187feeb 40656:cdfd4d09b79a
432 Returns nil if MARKER points into a dead buffer. */) 432 Returns nil if MARKER points into a dead buffer. */)
433 (marker) 433 (marker)
434 register Lisp_Object marker; 434 register Lisp_Object marker;
435 { 435 {
436 register Lisp_Object buf; 436 register Lisp_Object buf;
437 CHECK_MARKER (marker, 0); 437 CHECK_MARKER (marker);
438 if (XMARKER (marker)->buffer) 438 if (XMARKER (marker)->buffer)
439 { 439 {
440 XSETBUFFER (buf, XMARKER (marker)->buffer); 440 XSETBUFFER (buf, XMARKER (marker)->buffer);
441 /* Return marker's buffer only if it is not dead. */ 441 /* Return marker's buffer only if it is not dead. */
442 if (!NILP (XBUFFER (buf)->name)) 442 if (!NILP (XBUFFER (buf)->name))
448 DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0, 448 DEFUN ("marker-position", Fmarker_position, Smarker_position, 1, 1, 0,
449 doc: /* Return the position MARKER points at, as a character number. */) 449 doc: /* Return the position MARKER points at, as a character number. */)
450 (marker) 450 (marker)
451 Lisp_Object marker; 451 Lisp_Object marker;
452 { 452 {
453 CHECK_MARKER (marker, 0); 453 CHECK_MARKER (marker);
454 if (XMARKER (marker)->buffer) 454 if (XMARKER (marker)->buffer)
455 return make_number (XMARKER (marker)->charpos); 455 return make_number (XMARKER (marker)->charpos);
456 456
457 return Qnil; 457 return Qnil;
458 } 458 }
468 { 468 {
469 register int charno, bytepos; 469 register int charno, bytepos;
470 register struct buffer *b; 470 register struct buffer *b;
471 register struct Lisp_Marker *m; 471 register struct Lisp_Marker *m;
472 472
473 CHECK_MARKER (marker, 0); 473 CHECK_MARKER (marker);
474 /* If position is nil or a marker that points nowhere, 474 /* If position is nil or a marker that points nowhere,
475 make this marker point nowhere. */ 475 make this marker point nowhere. */
476 if (NILP (position) 476 if (NILP (position)
477 || (MARKERP (position) && !XMARKER (position)->buffer)) 477 || (MARKERP (position) && !XMARKER (position)->buffer))
478 { 478 {
482 482
483 if (NILP (buffer)) 483 if (NILP (buffer))
484 b = current_buffer; 484 b = current_buffer;
485 else 485 else
486 { 486 {
487 CHECK_BUFFER (buffer, 1); 487 CHECK_BUFFER (buffer);
488 b = XBUFFER (buffer); 488 b = XBUFFER (buffer);
489 /* If buffer is dead, set marker to point nowhere. */ 489 /* If buffer is dead, set marker to point nowhere. */
490 if (EQ (b->name, Qnil)) 490 if (EQ (b->name, Qnil))
491 { 491 {
492 unchain_marker (marker); 492 unchain_marker (marker);
504 m->bytepos = XMARKER (position)->bytepos; 504 m->bytepos = XMARKER (position)->bytepos;
505 m->charpos = XMARKER (position)->charpos; 505 m->charpos = XMARKER (position)->charpos;
506 return marker; 506 return marker;
507 } 507 }
508 508
509 CHECK_NUMBER_COERCE_MARKER (position, 1); 509 CHECK_NUMBER_COERCE_MARKER (position);
510 510
511 charno = XINT (position); 511 charno = XINT (position);
512 512
513 if (charno < BUF_BEG (b)) 513 if (charno < BUF_BEG (b))
514 charno = BUF_BEG (b); 514 charno = BUF_BEG (b);
544 { 544 {
545 register int charno, bytepos; 545 register int charno, bytepos;
546 register struct buffer *b; 546 register struct buffer *b;
547 register struct Lisp_Marker *m; 547 register struct Lisp_Marker *m;
548 548
549 CHECK_MARKER (marker, 0); 549 CHECK_MARKER (marker);
550 /* If position is nil or a marker that points nowhere, 550 /* If position is nil or a marker that points nowhere,
551 make this marker point nowhere. */ 551 make this marker point nowhere. */
552 if (NILP (pos) 552 if (NILP (pos)
553 || (MARKERP (pos) && !XMARKER (pos)->buffer)) 553 || (MARKERP (pos) && !XMARKER (pos)->buffer))
554 { 554 {
558 558
559 if (NILP (buffer)) 559 if (NILP (buffer))
560 b = current_buffer; 560 b = current_buffer;
561 else 561 else
562 { 562 {
563 CHECK_BUFFER (buffer, 1); 563 CHECK_BUFFER (buffer);
564 b = XBUFFER (buffer); 564 b = XBUFFER (buffer);
565 /* If buffer is dead, set marker to point nowhere. */ 565 /* If buffer is dead, set marker to point nowhere. */
566 if (EQ (b->name, Qnil)) 566 if (EQ (b->name, Qnil))
567 { 567 {
568 unchain_marker (marker); 568 unchain_marker (marker);
580 m->bytepos = XMARKER (pos)->bytepos; 580 m->bytepos = XMARKER (pos)->bytepos;
581 m->charpos = XMARKER (pos)->charpos; 581 m->charpos = XMARKER (pos)->charpos;
582 return marker; 582 return marker;
583 } 583 }
584 584
585 CHECK_NUMBER_COERCE_MARKER (pos, 1); 585 CHECK_NUMBER_COERCE_MARKER (pos);
586 586
587 charno = XINT (pos); 587 charno = XINT (pos);
588 588
589 if (charno < BUF_BEGV (b)) 589 if (charno < BUF_BEGV (b))
590 charno = BUF_BEGV (b); 590 charno = BUF_BEGV (b);
620 int charpos, bytepos; 620 int charpos, bytepos;
621 { 621 {
622 register struct buffer *b; 622 register struct buffer *b;
623 register struct Lisp_Marker *m; 623 register struct Lisp_Marker *m;
624 624
625 CHECK_MARKER (marker, 0); 625 CHECK_MARKER (marker);
626 626
627 if (NILP (buffer)) 627 if (NILP (buffer))
628 b = current_buffer; 628 b = current_buffer;
629 else 629 else
630 { 630 {
631 CHECK_BUFFER (buffer, 1); 631 CHECK_BUFFER (buffer);
632 b = XBUFFER (buffer); 632 b = XBUFFER (buffer);
633 /* If buffer is dead, set marker to point nowhere. */ 633 /* If buffer is dead, set marker to point nowhere. */
634 if (EQ (b->name, Qnil)) 634 if (EQ (b->name, Qnil))
635 { 635 {
636 unchain_marker (marker); 636 unchain_marker (marker);
671 int charpos, bytepos; 671 int charpos, bytepos;
672 { 672 {
673 register struct buffer *b; 673 register struct buffer *b;
674 register struct Lisp_Marker *m; 674 register struct Lisp_Marker *m;
675 675
676 CHECK_MARKER (marker, 0); 676 CHECK_MARKER (marker);
677 677
678 if (NILP (buffer)) 678 if (NILP (buffer))
679 b = current_buffer; 679 b = current_buffer;
680 else 680 else
681 { 681 {
682 CHECK_BUFFER (buffer, 1); 682 CHECK_BUFFER (buffer);
683 b = XBUFFER (buffer); 683 b = XBUFFER (buffer);
684 /* If buffer is dead, set marker to point nowhere. */ 684 /* If buffer is dead, set marker to point nowhere. */
685 if (EQ (b->name, Qnil)) 685 if (EQ (b->name, Qnil))
686 { 686 {
687 unchain_marker (marker); 687 unchain_marker (marker);
841 doc: /* Return insertion type of MARKER: t if it stays after inserted text. 841 doc: /* Return insertion type of MARKER: t if it stays after inserted text.
842 nil means the marker stays before text inserted there. */) 842 nil means the marker stays before text inserted there. */)
843 (marker) 843 (marker)
844 register Lisp_Object marker; 844 register Lisp_Object marker;
845 { 845 {
846 CHECK_MARKER (marker, 0); 846 CHECK_MARKER (marker);
847 return XMARKER (marker)->insertion_type ? Qt : Qnil; 847 return XMARKER (marker)->insertion_type ? Qt : Qnil;
848 } 848 }
849 849
850 DEFUN ("set-marker-insertion-type", Fset_marker_insertion_type, 850 DEFUN ("set-marker-insertion-type", Fset_marker_insertion_type,
851 Sset_marker_insertion_type, 2, 2, 0, 851 Sset_marker_insertion_type, 2, 2, 0,
853 If TYPE is t, it means the marker advances when you insert text at it. 853 If TYPE is t, it means the marker advances when you insert text at it.
854 If TYPE is nil, it means the marker stays behind when you insert text at it. */) 854 If TYPE is nil, it means the marker stays behind when you insert text at it. */)
855 (marker, type) 855 (marker, type)
856 Lisp_Object marker, type; 856 Lisp_Object marker, type;
857 { 857 {
858 CHECK_MARKER (marker, 0); 858 CHECK_MARKER (marker);
859 859
860 XMARKER (marker)->insertion_type = ! NILP (type); 860 XMARKER (marker)->insertion_type = ! NILP (type);
861 return type; 861 return type;
862 } 862 }
863 863