X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Findent.c;h=9ecf75ba5918feffda416ee4fe84eed337812890;hb=4aa6e8eb91e514ddfac11bc89a946b247cdf99d1;hp=f72f02072d3cbc1573a8d89dfd89e917161b96f5;hpb=e0dca7e74f4180d646721d8545e1de6f8a2f97df;p=chise%2Fxemacs-chise.git diff --git a/src/indent.c b/src/indent.c index f72f020..9ecf75b 100644 --- a/src/indent.c +++ b/src/indent.c @@ -195,7 +195,7 @@ column_at_point (struct buffer *buf, Bufpos init_pos, int cur_col) } int -string_column_at_point (struct Lisp_String* s, Bufpos init_pos, int tab_width) +string_column_at_point (Lisp_String* s, Bufpos init_pos, int tab_width) { int col; int tab_seen; @@ -272,11 +272,11 @@ If BUFFER is nil, the current buffer is assumed. DEFUN ("indent-to", Findent_to, 1, 3, "NIndent to column: ", /* Indent from point with tabs and spaces until COLUMN is reached. -Optional second argument MIN says always do at least MIN spaces - even if that goes past COLUMN; by default, MIN is zero. +Optional second argument MINIMUM says always do at least MINIMUM spaces + even if that goes past COLUMN; by default, MINIMUM is zero. If BUFFER is nil, the current buffer is assumed. */ - (col, minimum, buffer)) + (column, minimum, buffer)) { /* This function can GC */ int mincol; @@ -285,7 +285,7 @@ If BUFFER is nil, the current buffer is assumed. int tab_width = XINT (buf->tab_width); Bufpos opoint = 0; - CHECK_INT (col); + CHECK_INT (column); if (NILP (minimum)) minimum = Qzero; else @@ -295,7 +295,7 @@ If BUFFER is nil, the current buffer is assumed. fromcol = current_column (buf); mincol = fromcol + XINT (minimum); - if (mincol < XINT (col)) mincol = XINT (col); + if (mincol < XINT (column)) mincol = XINT (column); if (fromcol == mincol) return make_int (mincol);