diff options
| author | Pavel Janík | 2001-11-02 20:46:55 +0000 |
|---|---|---|
| committer | Pavel Janík | 2001-11-02 20:46:55 +0000 |
| commit | b78265036088d5d0eac2a03b929adb50aa59b45c (patch) | |
| tree | de99fe733144deb926fd31ee7bdff95cb1bc5073 /src/buffer.c | |
| parent | 00a2cef7d11a1b193891eb3d28274ef7fc7c3fe4 (diff) | |
| download | emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.tar.gz emacs-b78265036088d5d0eac2a03b929adb50aa59b45c.zip | |
Update usage of CHECK_ macros (remove unused second argument).
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/buffer.c b/src/buffer.c index f3b6d5f735f..2207adcf406 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -220,7 +220,7 @@ If the optional arg FRAME is a frame, we return that frame's buffer list. */) | |||
| 220 | { | 220 | { |
| 221 | Lisp_Object tail; | 221 | Lisp_Object tail; |
| 222 | 222 | ||
| 223 | CHECK_FRAME (frame, 1); | 223 | CHECK_FRAME (frame); |
| 224 | 224 | ||
| 225 | framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); | 225 | framelist = Fcopy_sequence (XFRAME (frame)->buffer_list); |
| 226 | 226 | ||
| @@ -267,7 +267,7 @@ NAME may also be a buffer; if so, the value is that buffer. */) | |||
| 267 | { | 267 | { |
| 268 | if (BUFFERP (name)) | 268 | if (BUFFERP (name)) |
| 269 | return name; | 269 | return name; |
| 270 | CHECK_STRING (name, 0); | 270 | CHECK_STRING (name); |
| 271 | 271 | ||
| 272 | return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist)); | 272 | return Fcdr (assoc_ignore_text_properties (name, Vbuffer_alist)); |
| 273 | } | 273 | } |
| @@ -283,7 +283,7 @@ See also `find-buffer-visiting'. */) | |||
| 283 | register Lisp_Object tail, buf, tem; | 283 | register Lisp_Object tail, buf, tem; |
| 284 | Lisp_Object handler; | 284 | Lisp_Object handler; |
| 285 | 285 | ||
| 286 | CHECK_STRING (filename, 0); | 286 | CHECK_STRING (filename); |
| 287 | filename = Fexpand_file_name (filename, Qnil); | 287 | filename = Fexpand_file_name (filename, Qnil); |
| 288 | 288 | ||
| 289 | /* If the file name has special constructs in it, | 289 | /* If the file name has special constructs in it, |
| @@ -739,7 +739,7 @@ even if a buffer with that name exists. */) | |||
| 739 | int count; | 739 | int count; |
| 740 | char number[10]; | 740 | char number[10]; |
| 741 | 741 | ||
| 742 | CHECK_STRING (name, 0); | 742 | CHECK_STRING (name); |
| 743 | 743 | ||
| 744 | tem = Fget_buffer (name); | 744 | tem = Fget_buffer (name); |
| 745 | if (NILP (tem)) | 745 | if (NILP (tem)) |
| @@ -768,7 +768,7 @@ With no argument or nil as argument, return the name of the current buffer. */) | |||
| 768 | { | 768 | { |
| 769 | if (NILP (buffer)) | 769 | if (NILP (buffer)) |
| 770 | return current_buffer->name; | 770 | return current_buffer->name; |
| 771 | CHECK_BUFFER (buffer, 0); | 771 | CHECK_BUFFER (buffer); |
| 772 | return XBUFFER (buffer)->name; | 772 | return XBUFFER (buffer)->name; |
| 773 | } | 773 | } |
| 774 | 774 | ||
| @@ -780,7 +780,7 @@ No argument or nil as argument means use the current buffer. */) | |||
| 780 | { | 780 | { |
| 781 | if (NILP (buffer)) | 781 | if (NILP (buffer)) |
| 782 | return current_buffer->filename; | 782 | return current_buffer->filename; |
| 783 | CHECK_BUFFER (buffer, 0); | 783 | CHECK_BUFFER (buffer); |
| 784 | return XBUFFER (buffer)->filename; | 784 | return XBUFFER (buffer)->filename; |
| 785 | } | 785 | } |
| 786 | 786 | ||
| @@ -798,7 +798,7 @@ If BUFFER is not indirect, return nil. */) | |||
| 798 | base = current_buffer->base_buffer; | 798 | base = current_buffer->base_buffer; |
| 799 | else | 799 | else |
| 800 | { | 800 | { |
| 801 | CHECK_BUFFER (buffer, 0); | 801 | CHECK_BUFFER (buffer); |
| 802 | base = XBUFFER (buffer)->base_buffer; | 802 | base = XBUFFER (buffer)->base_buffer; |
| 803 | } | 803 | } |
| 804 | 804 | ||
| @@ -825,7 +825,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) | |||
| 825 | buf = current_buffer; | 825 | buf = current_buffer; |
| 826 | else | 826 | else |
| 827 | { | 827 | { |
| 828 | CHECK_BUFFER (buffer, 0); | 828 | CHECK_BUFFER (buffer); |
| 829 | buf = XBUFFER (buffer); | 829 | buf = XBUFFER (buffer); |
| 830 | } | 830 | } |
| 831 | 831 | ||
| @@ -892,7 +892,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) | |||
| 892 | buf = current_buffer; | 892 | buf = current_buffer; |
| 893 | else | 893 | else |
| 894 | { | 894 | { |
| 895 | CHECK_BUFFER (buffer, 0); | 895 | CHECK_BUFFER (buffer); |
| 896 | buf = XBUFFER (buffer); | 896 | buf = XBUFFER (buffer); |
| 897 | } | 897 | } |
| 898 | 898 | ||
| @@ -994,7 +994,7 @@ No argument or nil as argument means use current buffer as BUFFER. */) | |||
| 994 | buf = current_buffer; | 994 | buf = current_buffer; |
| 995 | else | 995 | else |
| 996 | { | 996 | { |
| 997 | CHECK_BUFFER (buffer, 0); | 997 | CHECK_BUFFER (buffer); |
| 998 | buf = XBUFFER (buffer); | 998 | buf = XBUFFER (buffer); |
| 999 | } | 999 | } |
| 1000 | 1000 | ||
| @@ -1016,7 +1016,7 @@ This does not change the name of the visited file (if any). */) | |||
| 1016 | { | 1016 | { |
| 1017 | register Lisp_Object tem, buf; | 1017 | register Lisp_Object tem, buf; |
| 1018 | 1018 | ||
| 1019 | CHECK_STRING (newname, 0); | 1019 | CHECK_STRING (newname); |
| 1020 | 1020 | ||
| 1021 | if (XSTRING (newname)->size == 0) | 1021 | if (XSTRING (newname)->size == 0) |
| 1022 | error ("Empty string is invalid as a buffer name"); | 1022 | error ("Empty string is invalid as a buffer name"); |
| @@ -1903,8 +1903,8 @@ void | |||
| 1903 | validate_region (b, e) | 1903 | validate_region (b, e) |
| 1904 | register Lisp_Object *b, *e; | 1904 | register Lisp_Object *b, *e; |
| 1905 | { | 1905 | { |
| 1906 | CHECK_NUMBER_COERCE_MARKER (*b, 0); | 1906 | CHECK_NUMBER_COERCE_MARKER (*b); |
| 1907 | CHECK_NUMBER_COERCE_MARKER (*e, 1); | 1907 | CHECK_NUMBER_COERCE_MARKER (*e); |
| 1908 | 1908 | ||
| 1909 | if (XINT (*b) > XINT (*e)) | 1909 | if (XINT (*b) > XINT (*e)) |
| 1910 | { | 1910 | { |
| @@ -3371,7 +3371,7 @@ rear delimiter advance when text is inserted there. */) | |||
| 3371 | if (NILP (buffer)) | 3371 | if (NILP (buffer)) |
| 3372 | XSETBUFFER (buffer, current_buffer); | 3372 | XSETBUFFER (buffer, current_buffer); |
| 3373 | else | 3373 | else |
| 3374 | CHECK_BUFFER (buffer, 2); | 3374 | CHECK_BUFFER (buffer); |
| 3375 | if (MARKERP (beg) | 3375 | if (MARKERP (beg) |
| 3376 | && ! EQ (Fmarker_buffer (beg), buffer)) | 3376 | && ! EQ (Fmarker_buffer (beg), buffer)) |
| 3377 | error ("Marker points into wrong buffer"); | 3377 | error ("Marker points into wrong buffer"); |
| @@ -3379,8 +3379,8 @@ rear delimiter advance when text is inserted there. */) | |||
| 3379 | && ! EQ (Fmarker_buffer (end), buffer)) | 3379 | && ! EQ (Fmarker_buffer (end), buffer)) |
| 3380 | error ("Marker points into wrong buffer"); | 3380 | error ("Marker points into wrong buffer"); |
| 3381 | 3381 | ||
| 3382 | CHECK_NUMBER_COERCE_MARKER (beg, 1); | 3382 | CHECK_NUMBER_COERCE_MARKER (beg); |
| 3383 | CHECK_NUMBER_COERCE_MARKER (end, 1); | 3383 | CHECK_NUMBER_COERCE_MARKER (end); |
| 3384 | 3384 | ||
| 3385 | if (XINT (beg) > XINT (end)) | 3385 | if (XINT (beg) > XINT (end)) |
| 3386 | { | 3386 | { |
| @@ -3462,12 +3462,12 @@ buffer. */) | |||
| 3462 | Lisp_Object obuffer; | 3462 | Lisp_Object obuffer; |
| 3463 | int count = specpdl_ptr - specpdl; | 3463 | int count = specpdl_ptr - specpdl; |
| 3464 | 3464 | ||
| 3465 | CHECK_OVERLAY (overlay, 0); | 3465 | CHECK_OVERLAY (overlay); |
| 3466 | if (NILP (buffer)) | 3466 | if (NILP (buffer)) |
| 3467 | buffer = Fmarker_buffer (OVERLAY_START (overlay)); | 3467 | buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
| 3468 | if (NILP (buffer)) | 3468 | if (NILP (buffer)) |
| 3469 | XSETBUFFER (buffer, current_buffer); | 3469 | XSETBUFFER (buffer, current_buffer); |
| 3470 | CHECK_BUFFER (buffer, 3); | 3470 | CHECK_BUFFER (buffer); |
| 3471 | 3471 | ||
| 3472 | if (MARKERP (beg) | 3472 | if (MARKERP (beg) |
| 3473 | && ! EQ (Fmarker_buffer (beg), buffer)) | 3473 | && ! EQ (Fmarker_buffer (beg), buffer)) |
| @@ -3476,8 +3476,8 @@ buffer. */) | |||
| 3476 | && ! EQ (Fmarker_buffer (end), buffer)) | 3476 | && ! EQ (Fmarker_buffer (end), buffer)) |
| 3477 | error ("Marker points into wrong buffer"); | 3477 | error ("Marker points into wrong buffer"); |
| 3478 | 3478 | ||
| 3479 | CHECK_NUMBER_COERCE_MARKER (beg, 1); | 3479 | CHECK_NUMBER_COERCE_MARKER (beg); |
| 3480 | CHECK_NUMBER_COERCE_MARKER (end, 1); | 3480 | CHECK_NUMBER_COERCE_MARKER (end); |
| 3481 | 3481 | ||
| 3482 | if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate))) | 3482 | if (XINT (beg) == XINT (end) && ! NILP (Foverlay_get (overlay, Qevaporate))) |
| 3483 | return Fdelete_overlay (overlay); | 3483 | return Fdelete_overlay (overlay); |
| @@ -3563,7 +3563,7 @@ DEFUN ("delete-overlay", Fdelete_overlay, Sdelete_overlay, 1, 1, 0, | |||
| 3563 | struct buffer *b; | 3563 | struct buffer *b; |
| 3564 | int count = specpdl_ptr - specpdl; | 3564 | int count = specpdl_ptr - specpdl; |
| 3565 | 3565 | ||
| 3566 | CHECK_OVERLAY (overlay, 0); | 3566 | CHECK_OVERLAY (overlay); |
| 3567 | 3567 | ||
| 3568 | buffer = Fmarker_buffer (OVERLAY_START (overlay)); | 3568 | buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
| 3569 | if (NILP (buffer)) | 3569 | if (NILP (buffer)) |
| @@ -3599,7 +3599,7 @@ DEFUN ("overlay-start", Foverlay_start, Soverlay_start, 1, 1, 0, | |||
| 3599 | (overlay) | 3599 | (overlay) |
| 3600 | Lisp_Object overlay; | 3600 | Lisp_Object overlay; |
| 3601 | { | 3601 | { |
| 3602 | CHECK_OVERLAY (overlay, 0); | 3602 | CHECK_OVERLAY (overlay); |
| 3603 | 3603 | ||
| 3604 | return (Fmarker_position (OVERLAY_START (overlay))); | 3604 | return (Fmarker_position (OVERLAY_START (overlay))); |
| 3605 | } | 3605 | } |
| @@ -3609,7 +3609,7 @@ DEFUN ("overlay-end", Foverlay_end, Soverlay_end, 1, 1, 0, | |||
| 3609 | (overlay) | 3609 | (overlay) |
| 3610 | Lisp_Object overlay; | 3610 | Lisp_Object overlay; |
| 3611 | { | 3611 | { |
| 3612 | CHECK_OVERLAY (overlay, 0); | 3612 | CHECK_OVERLAY (overlay); |
| 3613 | 3613 | ||
| 3614 | return (Fmarker_position (OVERLAY_END (overlay))); | 3614 | return (Fmarker_position (OVERLAY_END (overlay))); |
| 3615 | } | 3615 | } |
| @@ -3619,7 +3619,7 @@ DEFUN ("overlay-buffer", Foverlay_buffer, Soverlay_buffer, 1, 1, 0, | |||
| 3619 | (overlay) | 3619 | (overlay) |
| 3620 | Lisp_Object overlay; | 3620 | Lisp_Object overlay; |
| 3621 | { | 3621 | { |
| 3622 | CHECK_OVERLAY (overlay, 0); | 3622 | CHECK_OVERLAY (overlay); |
| 3623 | 3623 | ||
| 3624 | return Fmarker_buffer (OVERLAY_START (overlay)); | 3624 | return Fmarker_buffer (OVERLAY_START (overlay)); |
| 3625 | } | 3625 | } |
| @@ -3631,7 +3631,7 @@ OVERLAY. */) | |||
| 3631 | (overlay) | 3631 | (overlay) |
| 3632 | Lisp_Object overlay; | 3632 | Lisp_Object overlay; |
| 3633 | { | 3633 | { |
| 3634 | CHECK_OVERLAY (overlay, 0); | 3634 | CHECK_OVERLAY (overlay); |
| 3635 | 3635 | ||
| 3636 | return Fcopy_sequence (XOVERLAY (overlay)->plist); | 3636 | return Fcopy_sequence (XOVERLAY (overlay)->plist); |
| 3637 | } | 3637 | } |
| @@ -3647,7 +3647,7 @@ DEFUN ("overlays-at", Foverlays_at, Soverlays_at, 1, 1, 0, | |||
| 3647 | int len; | 3647 | int len; |
| 3648 | Lisp_Object result; | 3648 | Lisp_Object result; |
| 3649 | 3649 | ||
| 3650 | CHECK_NUMBER_COERCE_MARKER (pos, 0); | 3650 | CHECK_NUMBER_COERCE_MARKER (pos); |
| 3651 | 3651 | ||
| 3652 | len = 10; | 3652 | len = 10; |
| 3653 | /* We can't use alloca here because overlays_at can call xrealloc. */ | 3653 | /* We can't use alloca here because overlays_at can call xrealloc. */ |
| @@ -3679,8 +3679,8 @@ or between BEG and END. */) | |||
| 3679 | int len; | 3679 | int len; |
| 3680 | Lisp_Object result; | 3680 | Lisp_Object result; |
| 3681 | 3681 | ||
| 3682 | CHECK_NUMBER_COERCE_MARKER (beg, 0); | 3682 | CHECK_NUMBER_COERCE_MARKER (beg); |
| 3683 | CHECK_NUMBER_COERCE_MARKER (end, 0); | 3683 | CHECK_NUMBER_COERCE_MARKER (end); |
| 3684 | 3684 | ||
| 3685 | len = 10; | 3685 | len = 10; |
| 3686 | overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); | 3686 | overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
| @@ -3710,7 +3710,7 @@ If there are no more overlay boundaries after POS, return (point-max). */) | |||
| 3710 | int len; | 3710 | int len; |
| 3711 | int i; | 3711 | int i; |
| 3712 | 3712 | ||
| 3713 | CHECK_NUMBER_COERCE_MARKER (pos, 0); | 3713 | CHECK_NUMBER_COERCE_MARKER (pos); |
| 3714 | 3714 | ||
| 3715 | len = 10; | 3715 | len = 10; |
| 3716 | overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); | 3716 | overlay_vec = (Lisp_Object *) xmalloc (len * sizeof (Lisp_Object)); |
| @@ -3750,7 +3750,7 @@ If there are no more overlay boundaries before POS, return (point-min). */) | |||
| 3750 | Lisp_Object *overlay_vec; | 3750 | Lisp_Object *overlay_vec; |
| 3751 | int len; | 3751 | int len; |
| 3752 | 3752 | ||
| 3753 | CHECK_NUMBER_COERCE_MARKER (pos, 0); | 3753 | CHECK_NUMBER_COERCE_MARKER (pos); |
| 3754 | 3754 | ||
| 3755 | /* At beginning of buffer, we know the answer; | 3755 | /* At beginning of buffer, we know the answer; |
| 3756 | avoid bug subtracting 1 below. */ | 3756 | avoid bug subtracting 1 below. */ |
| @@ -3797,7 +3797,7 @@ DEFUN ("overlay-recenter", Foverlay_recenter, Soverlay_recenter, 1, 1, 0, | |||
| 3797 | (pos) | 3797 | (pos) |
| 3798 | Lisp_Object pos; | 3798 | Lisp_Object pos; |
| 3799 | { | 3799 | { |
| 3800 | CHECK_NUMBER_COERCE_MARKER (pos, 0); | 3800 | CHECK_NUMBER_COERCE_MARKER (pos); |
| 3801 | 3801 | ||
| 3802 | recenter_overlay_lists (current_buffer, XINT (pos)); | 3802 | recenter_overlay_lists (current_buffer, XINT (pos)); |
| 3803 | return Qnil; | 3803 | return Qnil; |
| @@ -3810,7 +3810,7 @@ DEFUN ("overlay-get", Foverlay_get, Soverlay_get, 2, 2, 0, | |||
| 3810 | { | 3810 | { |
| 3811 | Lisp_Object plist, fallback; | 3811 | Lisp_Object plist, fallback; |
| 3812 | 3812 | ||
| 3813 | CHECK_OVERLAY (overlay, 0); | 3813 | CHECK_OVERLAY (overlay); |
| 3814 | 3814 | ||
| 3815 | fallback = Qnil; | 3815 | fallback = Qnil; |
| 3816 | 3816 | ||
| @@ -3840,7 +3840,7 @@ DEFUN ("overlay-put", Foverlay_put, Soverlay_put, 3, 3, 0, | |||
| 3840 | Lisp_Object tail, buffer; | 3840 | Lisp_Object tail, buffer; |
| 3841 | int changed; | 3841 | int changed; |
| 3842 | 3842 | ||
| 3843 | CHECK_OVERLAY (overlay, 0); | 3843 | CHECK_OVERLAY (overlay); |
| 3844 | 3844 | ||
| 3845 | buffer = Fmarker_buffer (OVERLAY_START (overlay)); | 3845 | buffer = Fmarker_buffer (OVERLAY_START (overlay)); |
| 3846 | 3846 | ||