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.328 | 82 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 patches/source/vim/patches/7.4.328 (limited to 'patches/source/vim/patches/7.4.328') diff --git a/patches/source/vim/patches/7.4.328 b/patches/source/vim/patches/7.4.328 new file mode 100644 index 000000000..d1f8c493b --- /dev/null +++ b/patches/source/vim/patches/7.4.328 @@ -0,0 +1,82 @@ +To: vim_dev@googlegroups.com +Subject: Patch 7.4.328 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.4.328 +Problem: Selection of inner block is inconsistent. +Solution: Skip indent not only for '}' but all parens. (Tom McDonald) +Files: src/search.c + + +*** ../vim-7.4.327/src/search.c 2014-03-23 15:12:29.935264336 +0100 +--- src/search.c 2014-06-17 12:37:49.075923106 +0200 +*************** +*** 3608,3628 **** + + /* + * Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE. +! * If the ending '}' is only preceded by indent, skip that indent. +! * But only if the resulting area is not smaller than what we started with. + */ + while (!include) + { + incl(&start_pos); + sol = (curwin->w_cursor.col == 0); + decl(&curwin->w_cursor); +! if (what == '{') +! while (inindent(1)) +! { +! sol = TRUE; +! if (decl(&curwin->w_cursor) != 0) +! break; +! } + /* + * In Visual mode, when the resulting area is not bigger than what we + * started with, extend it to the next block, and then exclude again. +--- 3608,3629 ---- + + /* + * Try to exclude the '(', '{', ')', '}', etc. when "include" is FALSE. +! * If the ending '}', ')' or ']' is only preceded by indent, skip that +! * indent. But only if the resulting area is not smaller than what we +! * started with. + */ + while (!include) + { + incl(&start_pos); + sol = (curwin->w_cursor.col == 0); + decl(&curwin->w_cursor); +! while (inindent(1)) +! { +! sol = TRUE; +! if (decl(&curwin->w_cursor) != 0) +! break; +! } +! + /* + * In Visual mode, when the resulting area is not bigger than what we + * started with, extend it to the next block, and then exclude again. +*** ../vim-7.4.327/src/version.c 2014-06-17 12:51:13.207953527 +0200 +--- src/version.c 2014-06-17 12:52:35.279956632 +0200 +*************** +*** 736,737 **** +--- 736,739 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 328, + /**/ + +-- +FATHER: One day, lad, all this will be yours ... +PRINCE: What - the curtains? + "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD + + /// 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