commit 1b38dc00b55a309d894d59aa1990ebb14c1eaf5b
Author: Elan Ruusamäe <[email protected]>
Date: Tue Dec 22 11:01:56 2015 +0200
merge cron-vars-79981.patch patch into vixie.patch
cron-vars-79981.patch seems to contain in vixie.patch since 9eb47a31 anyway
010_all_vim-6.3-vixie.patch | 20 +++++++++++++++-----
013_all_vim-7.0-cron-vars-79981.patch | 28 ----------------------------
vim.spec | 2 --
3 files changed, 15 insertions(+), 35 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index b28b2db..d131200 100644
--- a/vim.spec
+++ b/vim.spec
@@ -89,7 +89,6 @@ Patch9: %{name}-modprobe.patch
Patch10: %{name}-doubleparenthesis.patch
Patch11: %{name}-syntax-fstab.patch
Patch12: 010_all_%{name}-6.3-vixie.patch
-Patch13: 013_all_%{name}-7.0-cron-vars-79981.patch
Patch14: 020_all_%{name}-7.0-fstab-tmpfs-size.patch
Patch15: 021_all_%{name}-7.0-fstab-bogus-errors.patch
Patch17: 027_all_%{name}-7.0-automake-substitutions-93378.patch
@@ -761,7 +760,6 @@ jak również GUI GTK+2.
%patch10 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch17 -p0
diff --git a/010_all_vim-6.3-vixie.patch b/010_all_vim-6.3-vixie.patch
index f8b7d26..ed3aec2 100644
--- a/010_all_vim-6.3-vixie.patch
+++ b/010_all_vim-6.3-vixie.patch
@@ -1,5 +1,5 @@
---- vim74/runtime/syntax/crontab.vim~ 2013-09-06 00:07:40.000000000 +0300
-+++ vim74/runtime/syntax/crontab.vim 2013-09-06 00:09:14.394009460 +0300
+--- vim74/runtime/syntax/crontab.vim~ 2012-05-18 14:05:25.000000000 +0300
++++ vim74/runtime/syntax/crontab.vim 2015-12-22 10:46:53.994022359 +0200
@@ -18,17 +18,20 @@
finish
endif
@@ -25,7 +25,7 @@
syntax match crontabCmnt "^\s*#.*" contains=@Spell
syntax match crontabPercent "[^\\]%.*"lc=1 contained
-@@ -37,6 +40,12 @@
+@@ -36,6 +39,17 @@
syntax match crontabVar "^\s*\k\w*\s*="me=e-1
@@ -35,10 +35,15 @@
+syntax match crontabVarVal contained /["']\@!\S\+/ skipwhite
+
+
++syntax match crontabVar /^[A-Za-z][A-Za-z0-9\-\_]*/ nextgroup=crontabVarEq
skipwhite
++syntax match crontabVarEq contained /=/
nextgroup=CrontabVarValQ,CrontabVarVal skipwhite
++syntax match crontabVarValQ contained /\(["']\).*\1/ skipwhite
++syntax match crontabVarVal contained /["']\@!\S\+/ skipwhite
++
" Define the default highlighting.
" For version 5.7 and earlier: only when not done already
" For version 5.8 and later: only when an item doesn't have highlighting yet
-@@ -48,6 +57,7 @@
+@@ -47,6 +61,7 @@
command -nargs=+ HiLink hi def link <args>
endif
@@ -46,7 +51,7 @@
HiLink crontabMin Number
HiLink crontabHr PreProc
HiLink crontabDay Type
-@@ -69,6 +79,13 @@
+@@ -68,6 +83,18 @@
" comment out next line for to suppress unix commands coloring.
HiLink crontabCmd Statement
@@ -57,6 +62,11 @@
+ HiLink crontabVarVal Constant
+ HiLink crontabVarValQ String
+
++ HiLink crontabVar Identifier
++ HiLink crontabVarEq Special
++ HiLink crontabVarVal Constant
++ HiLink crontabVarValQ String
++
HiLink crontabCmnt Comment
delcommand HiLink
diff --git a/013_all_vim-7.0-cron-vars-79981.patch
b/013_all_vim-7.0-cron-vars-79981.patch
deleted file mode 100644
index 33197b6..0000000
--- a/013_all_vim-7.0-cron-vars-79981.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-# foo=bar highlighting in crontab files. Gentoo bug 79981.
-
---- vim70aa/runtime/syntax/crontab.vim.orig 2005-01-29 19:47:38.639175808
+0000
-+++ vim70aa/runtime/syntax/crontab.vim 2005-01-29 19:51:58.631650944 +0000
-@@ -35,6 +35,11 @@
- syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite
contained contains=crontabCmnt,crontabCmdSpecial keepend
- syntax match crontabCmnt /#.*/
-
-+syntax match crontabVar /^[A-Za-z][A-Za-z0-9\-\_]*/ nextgroup=crontabVarEq
skipwhite
-+syntax match crontabVarEq contained /=/
nextgroup=CrontabVarValQ,CrontabVarVal skipwhite
-+syntax match crontabVarValQ contained /\(["']\).*\1/ skipwhite
-+syntax match crontabVarVal contained /["']\@!\S\+/ skipwhite
-+
- " Define the default highlighting.
- " For version 5.7 and earlier: only when not done already
- " For version 5.8 and later: only when an item doesn't have highlighting yet
-@@ -66,6 +71,11 @@
- HiLink crontabCmd Type
- HiLink crontabCmdSpecial Special
-
-+ HiLink crontabVar Identifier
-+ HiLink crontabVarEq Special
-+ HiLink crontabVarVal Constant
-+ HiLink crontabVarValQ String
-+
- HiLink crontabCmnt Comment
-
- delcommand HiLink
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/1b38dc00b55a309d894d59aa1990ebb14c1eaf5b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
