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.178 | |
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.178')
-rw-r--r-- | source/ap/vim/patches/7.3.178 | 163 |
1 files changed, 0 insertions, 163 deletions
diff --git a/source/ap/vim/patches/7.3.178 b/source/ap/vim/patches/7.3.178 deleted file mode 100644 index 9b6ca7c3a..000000000 --- a/source/ap/vim/patches/7.3.178 +++ /dev/null @@ -1,163 +0,0 @@ -To: vim_dev@googlegroups.com -Subject: Patch 7.3.178 -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.178 -Problem: C-indent doesn't handle code right after { correctly. -Solution: Fix detecting unterminated line. (Lech Lorens) -Files: src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok - - -*** ../vim-7.3.177/src/misc1.c 2011-04-28 17:48:39.000000000 +0200 ---- src/misc1.c 2011-05-10 11:35:09.000000000 +0200 -*************** -*** 4983,4989 **** - } - - /* -! * Return TRUE if there there is no code at *s. White space and comments are - * not considered code. - */ - static int ---- 4983,4989 ---- - } - - /* -! * Return TRUE if there is no code at *s. White space and comments are - * not considered code. - */ - static int -*************** -*** 5458,5465 **** - } - - /* -! * Recognize a line that starts with '{' or '}', or ends with ';', '{' or '}'. - * Don't consider "} else" a terminated line. - * Return the character terminating the line (ending char's have precedence if - * both apply in order to determine initializations). - */ ---- 5458,5468 ---- - } - - /* -! * 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). - */ -*************** -*** 5470,5475 **** ---- 5473,5479 ---- - int incl_comma; /* recognize a trailing comma */ - { - char_u found_start = 0; -+ unsigned n_open = 0; - - s = cin_skipcomment(s); - -*************** -*** 5480,5489 **** - { - /* skip over comments, "" strings and 'c'haracters */ - s = skip_string(cin_skipcomment(s)); -! if ((*s == ';' || (incl_open && *s == '{') || *s == '}' -! || (incl_comma && *s == ',')) - && cin_nocode(s + 1)) - return *s; - - if (*s) - s++; ---- 5484,5502 ---- - { - /* 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; -+ else if (*s == '{') -+ { -+ if (incl_open && cin_nocode(s + 1)) -+ return *s; -+ else -+ ++n_open; -+ } - - if (*s) - s++; -*** ../vim-7.3.177/src/testdir/test3.in 2011-04-28 13:01:59.000000000 +0200 ---- src/testdir/test3.in 2011-05-10 11:34:13.000000000 +0200 -*************** -*** 1344,1349 **** ---- 1344,1365 ---- - } - - STARTTEST -+ :set cino& -+ 2kdd=][ -+ ENDTEST -+ -+ void func(void) -+ { -+ if(x==y) -+ if(y==z) -+ foo=1; -+ else { bar=1; -+ baz=2; -+ } -+ printf("Foo!\n"); -+ } -+ -+ STARTTEST - :g/^STARTTEST/.,/^ENDTEST/d - :1;/start of AUTO/,$wq! test.out - ENDTEST -*** ../vim-7.3.177/src/testdir/test3.ok 2011-04-28 13:01:59.000000000 +0200 ---- src/testdir/test3.ok 2011-05-10 11:34:13.000000000 +0200 -*************** -*** 1204,1206 **** ---- 1204,1218 ---- - { - } - -+ -+ void func(void) -+ { -+ if(x==y) -+ if(y==z) -+ foo=1; -+ else { bar=1; -+ baz=2; -+ } -+ printf("Foo!\n"); -+ } -+ -*** ../vim-7.3.177/src/version.c 2011-05-05 18:31:54.000000000 +0200 ---- src/version.c 2011-05-10 11:37:43.000000000 +0200 -*************** -*** 716,717 **** ---- 716,719 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 178, - /**/ - --- -hundred-and-one symptoms of being an internet addict: -69. Yahoo welcomes you with your own start page - - /// 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 /// |