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

updated for version 7.3.549

Browse Source 
Problem:    In 'cinoptions' "0s" is interpreted as one shiftwidth. (David
            Pineau)
Solution:   Use the zero as zero. (Lech Lorens)
This commit is contained in:
Bram Moolenaar
2012-06-13 13:40:48 +02:00
parent 27ba088549
commit 48d279215f
4 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/misc1.c
View File

@@ -6635,6 +6635,7 @@ get_c_indent()
int whilelevel;
linenr_T lnum;
char_u *options;
char_u *digits;
int fraction = 0; /* init for GCC */
int divider;
int n;
@@ -6650,6 +6651,7 @@ get_c_indent()
l = options++;
if (*options == '-')
++options;
digits = options; /* remember where the digits start */
n = getdigits(&options);
divider = 0;
if (*options == '.') /* ".5s" means a fraction */
@@ -6666,7 +6668,7 @@ get_c_indent()
}
if (*options == 's') /* "2s" means two times 'shiftwidth' */
{
if (n == 0 && fraction == 0)
if (options == digits)
n = curbuf->b_p_sw; /* just "s" is one 'shiftwidth' */
else
{