comparison src/indent.c @ 40656:cdfd4d09b79a

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 e528f2adeed4
children db9254d9c5d0
comparison
equal deleted inserted replaced
40655:45453187feeb 40656:cdfd4d09b79a
653 653
654 if (NILP (end)) 654 if (NILP (end))
655 e = XSTRING (string)->size; 655 e = XSTRING (string)->size;
656 else 656 else
657 { 657 {
658 CHECK_NUMBER (end, 0); 658 CHECK_NUMBER (end);
659 e = XINT (end); 659 e = XINT (end);
660 } 660 }
661 661
662 if (NILP (beg)) 662 if (NILP (beg))
663 b = 0; 663 b = 0;
664 else 664 else
665 { 665 {
666 CHECK_NUMBER (beg, 0); 666 CHECK_NUMBER (beg);
667 b = XINT (beg); 667 b = XINT (beg);
668 } 668 }
669 669
670 /* Make a pointer for decrementing through the chars before point. */ 670 /* Make a pointer for decrementing through the chars before point. */
671 ptr = XSTRING (string)->data + e; 671 ptr = XSTRING (string)->data + e;
723 { 723 {
724 int mincol; 724 int mincol;
725 register int fromcol; 725 register int fromcol;
726 register int tab_width = XINT (current_buffer->tab_width); 726 register int tab_width = XINT (current_buffer->tab_width);
727 727
728 CHECK_NUMBER (column, 0); 728 CHECK_NUMBER (column);
729 if (NILP (minimum)) 729 if (NILP (minimum))
730 XSETFASTINT (minimum, 0); 730 XSETFASTINT (minimum, 0);
731 CHECK_NUMBER (minimum, 1); 731 CHECK_NUMBER (minimum);
732 732
733 fromcol = current_column (); 733 fromcol = current_column ();
734 mincol = fromcol + XINT (minimum); 734 mincol = fromcol + XINT (minimum);
735 if (mincol < XINT (column)) mincol = XINT (column); 735 if (mincol < XINT (column)) mincol = XINT (column);
736 736
923 int next_boundary; 923 int next_boundary;
924 924
925 int pos_byte, end_byte, next_boundary_byte; 925 int pos_byte, end_byte, next_boundary_byte;
926 926
927 if (tab_width <= 0 || tab_width > 1000) tab_width = 8; 927 if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
928 CHECK_NATNUM (column, 0); 928 CHECK_NATNUM (column);
929 goal = XINT (column); 929 goal = XINT (column);
930 930
931 pos = PT; 931 pos = PT;
932 pos_byte = PT_BYTE; 932 pos_byte = PT_BYTE;
933 end = ZV; 933 end = ZV;
1745 { 1745 {
1746 Lisp_Object bufpos, hpos, vpos, prevhpos; 1746 Lisp_Object bufpos, hpos, vpos, prevhpos;
1747 struct position *pos; 1747 struct position *pos;
1748 int hscroll, tab_offset; 1748 int hscroll, tab_offset;
1749 1749
1750 CHECK_NUMBER_COERCE_MARKER (from, 0); 1750 CHECK_NUMBER_COERCE_MARKER (from);
1751 CHECK_CONS (frompos, 0); 1751 CHECK_CONS (frompos);
1752 CHECK_NUMBER_CAR (frompos, 0); 1752 CHECK_NUMBER_CAR (frompos);
1753 CHECK_NUMBER_CDR (frompos, 0); 1753 CHECK_NUMBER_CDR (frompos);
1754 CHECK_NUMBER_COERCE_MARKER (to, 0); 1754 CHECK_NUMBER_COERCE_MARKER (to);
1755 CHECK_CONS (topos, 0); 1755 CHECK_CONS (topos);
1756 CHECK_NUMBER_CAR (topos, 0); 1756 CHECK_NUMBER_CAR (topos);
1757 CHECK_NUMBER_CDR (topos, 0); 1757 CHECK_NUMBER_CDR (topos);
1758 CHECK_NUMBER (width, 0); 1758 CHECK_NUMBER (width);
1759 if (!NILP (offsets)) 1759 if (!NILP (offsets))
1760 { 1760 {
1761 CHECK_CONS (offsets, 0); 1761 CHECK_CONS (offsets);
1762 CHECK_NUMBER_CAR (offsets, 0); 1762 CHECK_NUMBER_CAR (offsets);
1763 CHECK_NUMBER_CDR (offsets, 0); 1763 CHECK_NUMBER_CDR (offsets);
1764 hscroll = XINT (XCAR (offsets)); 1764 hscroll = XINT (XCAR (offsets));
1765 tab_offset = XINT (XCDR (offsets)); 1765 tab_offset = XINT (XCDR (offsets));
1766 } 1766 }
1767 else 1767 else
1768 hscroll = tab_offset = 0; 1768 hscroll = tab_offset = 0;
1769 1769
1770 if (NILP (window)) 1770 if (NILP (window))
1771 window = Fselected_window (); 1771 window = Fselected_window ();
1772 else 1772 else
1773 CHECK_LIVE_WINDOW (window, 0); 1773 CHECK_LIVE_WINDOW (window);
1774 1774
1775 if (XINT (from) < BEGV || XINT (from) > ZV) 1775 if (XINT (from) < BEGV || XINT (from) > ZV)
1776 args_out_of_range_3 (from, make_number (BEGV), make_number (ZV)); 1776 args_out_of_range_3 (from, make_number (BEGV), make_number (ZV));
1777 if (XINT (to) < BEGV || XINT (to) > ZV) 1777 if (XINT (to) < BEGV || XINT (to) > ZV)
1778 args_out_of_range_3 (to, make_number (BEGV), make_number (ZV)); 1778 args_out_of_range_3 (to, make_number (BEGV), make_number (ZV));
1974 struct text_pos pt; 1974 struct text_pos pt;
1975 struct window *w; 1975 struct window *w;
1976 Lisp_Object old_buffer; 1976 Lisp_Object old_buffer;
1977 struct gcpro gcpro1; 1977 struct gcpro gcpro1;
1978 1978
1979 CHECK_NUMBER (lines, 0); 1979 CHECK_NUMBER (lines);
1980 if (! NILP (window)) 1980 if (! NILP (window))
1981 CHECK_WINDOW (window, 0); 1981 CHECK_WINDOW (window);
1982 else 1982 else
1983 window = selected_window; 1983 window = selected_window;
1984 w = XWINDOW (window); 1984 w = XWINDOW (window);
1985 1985
1986 old_buffer = Qnil; 1986 old_buffer = Qnil;