diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2013-11-04 17:08:47 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:57:36 +0200 |
commit | 76fc4757ac91ac7947a01fb7b53dddf9a78a01d1 (patch) | |
tree | 9b98e6e193c7870cb27ac861394c1c4592850922 /source/ap/vim/patches/7.3.195 | |
parent | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (diff) | |
download | current-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.gz current-76fc4757ac91ac7947a01fb7b53dddf9a78a01d1.tar.xz |
Slackware 14.1slackware-14.1
Mon Nov 4 17:08:47 UTC 2013
Slackware 14.1 x86_64 stable is released!
It's been another interesting release cycle here at Slackware bringing
new features like support for UEFI machines, updated compilers and
development tools, the switch from MySQL to MariaDB, and many more
improvements throughout the system. Thanks to the team, the upstream
developers, the dedicated Slackware community, and everyone else who
pitched in to help make this release a reality.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Have fun! :-)
Diffstat (limited to 'source/ap/vim/patches/7.3.195')
-rw-r--r-- | source/ap/vim/patches/7.3.195 | 199 |
1 files changed, 0 insertions, 199 deletions
diff --git a/source/ap/vim/patches/7.3.195 b/source/ap/vim/patches/7.3.195 deleted file mode 100644 index ba1fc2192..000000000 --- a/source/ap/vim/patches/7.3.195 +++ /dev/null @@ -1,199 +0,0 @@ -To: vim_dev@googlegroups.com -Subject: Patch 7.3.195 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.3.195 -Problem: "} else" causes following lines to be indented too much. (Rouben - Rostamian) -Solution: Better detection for the "else". (Lech Lorens) -Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok - - -*** ../vim-7.3.194/src/misc1.c 2011-05-10 16:41:13.000000000 +0200 ---- src/misc1.c 2011-05-19 16:30:28.000000000 +0200 -*************** -*** 5482,5489 **** - * Recognize a line that starts with '{' or '}', or ends with ';', ',', '{' or - * '}'. - * Don't consider "} else" a terminated line. -! * Don't consider a line where there are unmatched opening braces before '}', -! * ';' or ',' a terminated line. - * Return the character terminating the line (ending char's have precedence if - * both apply in order to determine initializations). - */ ---- 5482,5489 ---- - * Recognize a line that starts with '{' or '}', or ends with ';', ',', '{' or - * '}'. - * Don't consider "} else" a terminated line. -! * If a line begins with an "else", only consider it terminated if no unmatched -! * opening braces follow (handle "else { foo();" correctly). - * Return the character terminating the line (ending char's have precedence if - * both apply in order to determine initializations). - */ -*************** -*** 5493,5513 **** - int incl_open; /* include '{' at the end as terminator */ - int incl_comma; /* recognize a trailing comma */ - { -! char_u found_start = 0; -! unsigned n_open = 0; - - s = cin_skipcomment(s); - - if (*s == '{' || (*s == '}' && !cin_iselse(s))) - found_start = *s; - - while (*s) - { - /* skip over comments, "" strings and 'c'haracters */ - s = skip_string(cin_skipcomment(s)); - if (*s == '}' && n_open > 0) - --n_open; -! if (n_open == 0 - && (*s == ';' || *s == '}' || (incl_comma && *s == ',')) - && cin_nocode(s + 1)) - return *s; ---- 5493,5517 ---- - int incl_open; /* include '{' at the end as terminator */ - int incl_comma; /* recognize a trailing comma */ - { -! char_u found_start = 0; -! unsigned n_open = 0; -! int is_else = FALSE; - - s = cin_skipcomment(s); - - if (*s == '{' || (*s == '}' && !cin_iselse(s))) - found_start = *s; - -+ if (!found_start) -+ is_else = cin_iselse(s); -+ - while (*s) - { - /* skip over comments, "" strings and 'c'haracters */ - s = skip_string(cin_skipcomment(s)); - if (*s == '}' && n_open > 0) - --n_open; -! if ((!is_else || n_open == 0) - && (*s == ';' || *s == '}' || (incl_comma && *s == ',')) - && cin_nocode(s + 1)) - return *s; -*** ../vim-7.3.194/src/testdir/test3.in 2011-05-10 13:38:23.000000000 +0200 ---- src/testdir/test3.in 2011-05-19 16:29:01.000000000 +0200 -*************** -*** 1345,1351 **** - - STARTTEST - :set cino& -! 2kdd=][ - ENDTEST - - void func(void) ---- 1345,1351 ---- - - STARTTEST - :set cino& -! 2kdd=4][ - ENDTEST - - void func(void) -*************** -*** 1359,1364 **** ---- 1359,1392 ---- - printf("Foo!\n"); - } - -+ void func1(void) -+ { -+ char* tab[] = {"foo", "bar", -+ "baz", "quux", -+ "this line used", "to be indented incorrectly"}; -+ foo(); -+ } -+ -+ void func2(void) -+ { -+ int tab[] = -+ {1, 2, -+ 3, 4, -+ 5, 6}; -+ -+ printf("This line used to be indented incorrectly.\n"); -+ } -+ -+ void func3(void) -+ { -+ int tab[] = { -+ 1, 2, -+ 3, 4, -+ 5, 6}; -+ -+ printf("Don't you dare indent this line incorrectly!\n); -+ } -+ - STARTTEST - :set cino& - 2kdd=][ -*** ../vim-7.3.194/src/testdir/test3.ok 2011-05-10 13:38:23.000000000 +0200 ---- src/testdir/test3.ok 2011-05-19 16:29:01.000000000 +0200 -*************** -*** 1216,1221 **** ---- 1216,1249 ---- - printf("Foo!\n"); - } - -+ void func1(void) -+ { -+ char* tab[] = {"foo", "bar", -+ "baz", "quux", -+ "this line used", "to be indented incorrectly"}; -+ foo(); -+ } -+ -+ void func2(void) -+ { -+ int tab[] = -+ {1, 2, -+ 3, 4, -+ 5, 6}; -+ -+ printf("This line used to be indented incorrectly.\n"); -+ } -+ -+ void func3(void) -+ { -+ int tab[] = { -+ 1, 2, -+ 3, 4, -+ 5, 6}; -+ -+ printf("Don't you dare indent this line incorrectly!\n); -+ } -+ - - void func(void) - { -*** ../vim-7.3.194/src/version.c 2011-05-19 14:59:07.000000000 +0200 ---- src/version.c 2011-05-19 16:34:16.000000000 +0200 -*************** -*** 711,712 **** ---- 711,714 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 195, - /**/ - --- -I AM THANKFUL... -...for the taxes that I pay because it means that I am employed. - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ an exciting new programming language -- http://www.Zimbu.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |