From 8ff4f2f51a6cf07fc33742ce3bee81328896e49b Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 25 May 2018 23:29:36 +0000 Subject: Fri May 25 23:29:36 UTC 2018 patches/packages/glibc-zoneinfo-2018e-noarch-2_slack14.1.txz: Rebuilt. Handle removal of US/Pacific-New timezone. If we see that the machine is using this, it will be automatically switched to US/Pacific. --- patches/source/vim/patches/7.4.283 | 56 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 patches/source/vim/patches/7.4.283 (limited to 'patches/source/vim/patches/7.4.283') diff --git a/patches/source/vim/patches/7.4.283 b/patches/source/vim/patches/7.4.283 new file mode 100644 index 000000000..213847035 --- /dev/null +++ b/patches/source/vim/patches/7.4.283 @@ -0,0 +1,56 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.283 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.283 (after 7.4.276) +Problem: Compiler warning about unused variable. (Charles Cooper) +Solution: Move the variable inside the #if block. +Files: src/ex_cmds.c + + +*** ../vim-7.4.282/src/ex_cmds.c 2014-05-07 15:10:17.657108310 +0200 +--- src/ex_cmds.c 2014-05-09 20:31:16.414789550 +0200 +*************** +*** 1551,1559 **** + { + char_u *buf; + long_u len; +- int is_fish_shell; + + #if (defined(UNIX) && !defined(ARCHIE)) || defined(OS2) + /* Account for fish's different syntax for subshells */ + is_fish_shell = (fnamecmp(get_isolated_shell_name(), "fish") == 0); + if (is_fish_shell) +--- 1551,1560 ---- + { + char_u *buf; + long_u len; + + #if (defined(UNIX) && !defined(ARCHIE)) || defined(OS2) ++ int is_fish_shell; ++ + /* Account for fish's different syntax for subshells */ + is_fish_shell = (fnamecmp(get_isolated_shell_name(), "fish") == 0); + if (is_fish_shell) +*** ../vim-7.4.282/src/version.c 2014-05-08 11:46:23.621757543 +0200 +--- src/version.c 2014-05-09 20:32:06.538789989 +0200 +*************** +*** 736,737 **** +--- 736,739 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 283, + /**/ + +-- +Don't drink and drive. You might hit a bump and spill your beer. + + /// 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 /// -- cgit v1.2.3