updated for version 7.3.301
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)
diff --git a/src/misc1.c b/src/misc1.c
index a3a2059..589a145 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -363,7 +363,7 @@
/* 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 @@
}
/* 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;
diff --git a/src/testdir/test19.in b/src/testdir/test19.in
index bdcfb77..ff6e255 100644
--- a/src/testdir/test19.in
+++ b/src/testdir/test19.in
@@ -12,6 +12,9 @@
0wR
:" Test replacing with Tabs
0wR
+:" Test that copyindent works with expandtab set
+:set expandtab smartindent copyindent ts=8 sw=8 sts=8
+:exe "norm! o{\<cr>x"
:?^start?,$w! test.out
:qa!
ENDTEST
diff --git a/src/testdir/test19.ok b/src/testdir/test19.ok
index ba4eb63..23d5150 100644
--- a/src/testdir/test19.ok
+++ b/src/testdir/test19.ok
@@ -5,3 +5,5 @@
a cde
hi
test text
+{
+ x
diff --git a/src/version.c b/src/version.c
index c361403..be9f058 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 301,
+/**/
300,
/**/
299,
