thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.301

Browse Source 
Problem:    When 'smartindent' and 'copyindent' are set a Tab is used even
            though 'expandtab' is set.
Solution:   Do not insert Tabs. Add a test. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2011-09-07 19:58:09 +02:00
parent 275648066d
commit c42e7ed777
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc1.c
View File

@@ -363,7 +363,7 @@ copy_indent(size, src)
/* 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)
if (todo >= tab_pad && !curbuf->b_p_et)
{
todo -= tab_pad;
++ind_len;
@@ -372,7 +372,7 @@ copy_indent(size, src)
}
/* Add tabs required for indent */
while (todo >= (int)curbuf->b_p_ts)
while (todo >= (int)curbuf->b_p_ts && !curbuf->b_p_et)
{
todo -= (int)curbuf->b_p_ts;
++ind_len;