/[emacs]/emacs/src/indent.c
ViewVC logotype

Diff of /emacs/src/indent.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.140 by pj, Sun Oct 21 12:03:49 2001 UTC revision 1.141 by pj, Fri Nov 2 20:28:19 2001 UTC
# Line 655  string_display_width (string, beg, end) Line 655  string_display_width (string, beg, end)
655      e = XSTRING (string)->size;      e = XSTRING (string)->size;
656    else    else
657      {      {
658        CHECK_NUMBER (end, 0);        CHECK_NUMBER (end);
659        e = XINT (end);        e = XINT (end);
660      }      }
661    
# Line 663  string_display_width (string, beg, end) Line 663  string_display_width (string, beg, end)
663      b = 0;      b = 0;
664    else    else
665      {      {
666        CHECK_NUMBER (beg, 0);        CHECK_NUMBER (beg);
667        b = XINT (beg);        b = XINT (beg);
668      }      }
669    
# Line 725  even if that goes past COLUMN; by defaul Line 725  even if that goes past COLUMN; by defaul
725    register int fromcol;    register int fromcol;
726    register int tab_width = XINT (current_buffer->tab_width);    register int tab_width = XINT (current_buffer->tab_width);
727    
728    CHECK_NUMBER (column, 0);    CHECK_NUMBER (column);
729    if (NILP (minimum))    if (NILP (minimum))
730      XSETFASTINT (minimum, 0);      XSETFASTINT (minimum, 0);
731    CHECK_NUMBER (minimum, 1);    CHECK_NUMBER (minimum);
732    
733    fromcol = current_column ();    fromcol = current_column ();
734    mincol = fromcol + XINT (minimum);    mincol = fromcol + XINT (minimum);
# Line 925  The return value is the current column. Line 925  The return value is the current column.
925    int pos_byte, end_byte, next_boundary_byte;    int pos_byte, end_byte, next_boundary_byte;
926    
927    if (tab_width <= 0 || tab_width > 1000) tab_width = 8;    if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
928    CHECK_NATNUM (column, 0);    CHECK_NATNUM (column);
929    goal = XINT (column);    goal = XINT (column);
930    
931    pos = PT;    pos = PT;
# Line 1747  visible section of the buffer, and pass Line 1747  visible section of the buffer, and pass
1747    struct position *pos;    struct position *pos;
1748    int hscroll, tab_offset;    int hscroll, tab_offset;
1749    
1750    CHECK_NUMBER_COERCE_MARKER (from, 0);    CHECK_NUMBER_COERCE_MARKER (from);
1751    CHECK_CONS (frompos, 0);    CHECK_CONS (frompos);
1752    CHECK_NUMBER_CAR (frompos, 0);    CHECK_NUMBER_CAR (frompos);
1753    CHECK_NUMBER_CDR (frompos, 0);    CHECK_NUMBER_CDR (frompos);
1754    CHECK_NUMBER_COERCE_MARKER (to, 0);    CHECK_NUMBER_COERCE_MARKER (to);
1755    CHECK_CONS (topos, 0);    CHECK_CONS (topos);
1756    CHECK_NUMBER_CAR (topos, 0);    CHECK_NUMBER_CAR (topos);
1757    CHECK_NUMBER_CDR (topos, 0);    CHECK_NUMBER_CDR (topos);
1758    CHECK_NUMBER (width, 0);    CHECK_NUMBER (width);
1759    if (!NILP (offsets))    if (!NILP (offsets))
1760      {      {
1761        CHECK_CONS (offsets, 0);        CHECK_CONS (offsets);
1762        CHECK_NUMBER_CAR (offsets, 0);        CHECK_NUMBER_CAR (offsets);
1763        CHECK_NUMBER_CDR (offsets, 0);        CHECK_NUMBER_CDR (offsets);
1764        hscroll = XINT (XCAR (offsets));        hscroll = XINT (XCAR (offsets));
1765        tab_offset = XINT (XCDR (offsets));        tab_offset = XINT (XCDR (offsets));
1766      }      }
# Line 1770  visible section of the buffer, and pass Line 1770  visible section of the buffer, and pass
1770    if (NILP (window))    if (NILP (window))
1771      window = Fselected_window ();      window = Fselected_window ();
1772    else    else
1773      CHECK_LIVE_WINDOW (window, 0);      CHECK_LIVE_WINDOW (window);
1774    
1775    if (XINT (from) < BEGV || XINT (from) > ZV)    if (XINT (from) < BEGV || XINT (from) > ZV)
1776      args_out_of_range_3 (from, make_number (BEGV), make_number (ZV));      args_out_of_range_3 (from, make_number (BEGV), make_number (ZV));
# Line 1976  whether or not it is currently displayed Line 1976  whether or not it is currently displayed
1976    Lisp_Object old_buffer;    Lisp_Object old_buffer;
1977    struct gcpro gcpro1;    struct gcpro gcpro1;
1978    
1979    CHECK_NUMBER (lines, 0);    CHECK_NUMBER (lines);
1980    if (! NILP (window))    if (! NILP (window))
1981      CHECK_WINDOW (window, 0);      CHECK_WINDOW (window);
1982    else    else
1983      window = selected_window;      window = selected_window;
1984    w = XWINDOW (window);    w = XWINDOW (window);

Legend:
Removed from v.1.140  
changed lines
  Added in v.1.141

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26