Date: Tuesday, March 21, 2023 @ 21:00:15
Author: foxboron
Revision: 471706
upgpkg: vim 9.0.1420-1
Modified:
vim/trunk/PKGBUILD
Deleted:
vim/trunk/sh.vim.patch
--------------+
PKGBUILD | 16 ++++++----------
sh.vim.patch | 55 -------------------------------------------------------
2 files changed, 6 insertions(+), 65 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-21 20:29:19 UTC (rev 471705)
+++ PKGBUILD 2023-03-21 21:00:15 UTC (rev 471706)
@@ -10,7 +10,7 @@
pkgbase=vim
pkgname=('vim' 'gvim' 'vim-runtime')
-pkgver=9.0.1337
+pkgver=9.0.1420
_versiondir=90
pkgrel=1
pkgdesc='Vi Improved, a highly configurable, improved version of the vi text
editor'
@@ -22,21 +22,17 @@
source=(https://github.com/vim/vim/archive/v${pkgver}/${pkgbase}-${pkgver}.tar.gz
vimrc
archlinux.vim
- vimdoc.hook
- sh.vim.patch)
-sha256sums=('53edbd7503e1d225762507421e4d3f28d5aa7c6b1ea23e7c0cbf6133681d846b'
+ vimdoc.hook)
+sha256sums=('716440e1e88cc8252a997bdc394a43f7a8e0c2d63939f72694b18142e819dc2b'
'b16e85e457397ab2043a7ee0a3c84307c6b4eac157fd0b721694761f25b3ed5b'
'cc3d931129854c298eb22e993ec14c2ad86cc1e70a08a64496f5e06559289972'
- '8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae'
- '39a2f937b95f3fad564bceb6998a8ffcdc1ad1c35cf1ab3c97dbc6c7e97a51ec')
-sha512sums=('ed847ad5f8ce974d95bf137f14fe04af9cfb07c4fec189c67e62add932025ab512d3a8cb44e3245e8f72e2b50644b53bb4ee61f921293615f9fa09a4aa7f99dd'
+ '8e9656934d9d7793063230d15a689e10455e6db9b9fe73afa0f294792795d8ae')
+sha512sums=('1456979faa532bad0c506b601bff8b16bb705cd1563a7f9e4c7d60b9237be72f274716cbb00c9cf3110ea172278b68dc7892779d77f9edfb9d31f81423ac5ff3'
'4b5bed0813f22af9e158ea9aa56a4a9862dd786ba2d201f20159ccf652da6190164aaed0b6b7217d578f7b25c33a8adcc307bfcf3caa8d173a7ff29e2a00fee7'
'fe091d289d876f45319c898f6021ef86d6a238b540c225a279c46efc5c36fa7d868cd0cee73a111811c4be90df160f85340bb251be3a437727dbe5c699950363'
-
'a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1'
-
'4a5a70ad2b967e63365ea327cdc310f4cff1cb90b8ed0720c643c4ff622409a8b6d01ea1868ea1846dcb0e6497f0443610076f51242f3fe924c56ea3d7db69c2')
+
'a02ad0d66f300160911aeb81d8886c6c558436ac4ee3fcd161dd65c6b1e5d1f41b9005a7f5bb5ba68d57027fc1c8e43daabf055bd6207fb5a216a67f758df8d1')
prepare() {
- patch -Np1 --directory vim-${pkgver} < "${srcdir}/sh.vim.patch"
(cd vim-${pkgver}/src
# define the place for the global (g)vimrc file (set to /etc/vimrc)
sed -E 's|^.*(#define SYS_.*VIMRC_FILE.*").*$|\1|g' -i feature.h
Deleted: sh.vim.patch
===================================================================
--- sh.vim.patch 2023-03-21 20:29:19 UTC (rev 471705)
+++ sh.vim.patch 2023-03-21 21:00:15 UTC (rev 471706)
@@ -1,55 +0,0 @@
---- a/runtime/syntax/sh.vim 2023-02-15 21:24:10.943602904 +0100
-+++ b/runtime/syntax/sh.vim 2023-02-15 21:23:48.416993910 +0100
-@@ -2,8 +2,8 @@
- " Language: shell (sh) Korn shell (ksh) bash (sh)
- " Maintainer: Charles E. Campbell <[email protected]>
- " Previous Maintainer: Lennart Schultz <[email protected]>
--" Last Change: Dec 20, 2022
--" Version: 205
-+" Last Change: Feb 11, 2023
-+" Version: 207
- " URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
- " For options and settings, please use: :help ft-sh-syntax
- " This file includes many ideas from Eric Brunet ([email protected]) and
heredoc fixes from Felipe Contreras
-@@ -166,7 +166,7 @@
- syn cluster shLoopoList add=shForPP
- endif
- syn cluster shPPSLeftList
contains=shAlias,shArithmetic,shCmdParenRegion,shCommandSub,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
--syn cluster shPPSRightList
contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
-+syn cluster shPPSRightList
contains=shDeref,shDerefSimple,shEscape,shPosnParm
- syn cluster shSubShList
contains=@shCommandSubList,shCommandSubBQ,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
- syn cluster shTestList
contains=shArithmetic,shCharClass,shCommandSub,shCommandSubBQ,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shSpecialDQ,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shSingleQuote,shTest,shTestOpr
- syn cluster shNoZSList contains=shSpecialNoZS
-@@ -335,7 +335,7 @@
- " systems too, however, so the following syntax will flag $(..) as
- " an Error under /bin/sh. By consensus of vimdev'ers!
- if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix")
-- syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$"
skip='\\\\\|\\.' end=")" contains=@shCommandSubList
-+ syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]"
skip='\\\\\|\\.' end=")" contains=@shCommandSubList
- syn region shArithmetic matchgroup=shArithRegion start="\$(("
skip='\\\\\|\\.' end="))" contains=@shArithList
- syn region shArithmetic matchgroup=shArithRegion start="\$\["
skip='\\\\\|\\.' end="\]" contains=@shArithList
- syn match shSkipInitWS contained "^\s\+"
-@@ -503,7 +503,6 @@
- " ksh: ${.sh.*} variables: {{{1
- " ========================================
- if exists("b:is_kornshell")
--" syn match shDerefVar contained "[.]*"
nextgroup=@shDerefVarList
- syn match shDerefVar contained "\.\+"
nextgroup=@shDerefVarList
- endif
-
-@@ -548,6 +547,7 @@
- " bash : ${parameter,pattern} Case modification
- " bash : ${parameter,,pattern} Case modification
- " bash : ${@:start:qty} display command line arguments from
start to start+qty-1 (inferred)
-+" bash : ${parameter@operator} transforms parameter
(operator∈[uULqEPARa])
- syn cluster shDerefPatternList contains=shDerefPattern,shDerefString
- if !exists("g:sh_no_error")
- syn match shDerefOpError contained ":[[:punct:]]"
-@@ -563,6 +563,7 @@
- endif
- if exists("b:is_bash")
- syn match shDerefOp contained "[,^]\{1,2}"
nextgroup=@shDerefPatternList
-+ syn match shDerefOp contained "@[uULQEPAKa]"
- endif
- syn region shDerefString contained matchgroup=shDerefDelim
start=+\%(\\\)\@<!'+ end=+'+ contains=shStringSpecial
- syn region shDerefString contained matchgroup=shDerefDelim
start=+\%(\\\)\@<!"+ skip=+\\"+ end=+"+ contains=@shDblQuoteList,shStringSpecial
