aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00
Code Activity

updated for version 7.1-073

Browse Source
This commit is contained in:
Bram Moolenaar
2007-08-14 20:16:42 +00:00
parent 9c03978012
commit 4d64b7891b
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/misc1.c
View File

@@ -104,7 +104,7 @@ set_indent(size, flags)
int ind_done = 0; /* measured in spaces */
int tab_pad;
int retval = FALSE;
int orig_char_len = 0; /* number of initial whitespace chars when
int orig_char_len = -1; /* number of initial whitespace chars when
'et' and 'pi' are both set */
/*
@@ -159,7 +159,7 @@ set_indent(size, flags)
/* Fill to next tabstop with a tab, if possible */
tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts);
if (todo >= tab_pad && orig_char_len == 0)
if (todo >= tab_pad && orig_char_len == -1)
{
doit = TRUE;
todo -= tab_pad;
@@ -206,11 +206,15 @@ set_indent(size, flags)
/* If 'preserveindent' and 'expandtab' are both set keep the original
* characters and allocate accordingly. We will fill the rest with spaces
* after the if (!curbuf->b_p_et) below. */
if (orig_char_len != 0)
if (orig_char_len != -1)
{
newline = alloc(orig_char_len + size - ind_done + line_len);
if (newline == NULL)
return FALSE;
todo = size - ind_done;
ind_len = orig_char_len + todo; /* Set total length of indent in
* characters, which may have been
* undercounted until now */
p = oldline;
s = newline;
while (orig_char_len > 0)
@@ -222,9 +226,6 @@ set_indent(size, flags)
* than old) */
while (vim_iswhite(*p))
(void)*p++;
todo = size - ind_done;
ind_len += todo; /* Set total length of indent in characters,
* which may have been undercounted until now */
}
else

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
73,
/**/
72,
/**/