[packages/vim] sudoers: recognize #include and #includedir directives
glen
glen at pld-linux.org
Fri Dec 27 19:05:27 CET 2013
commit 2df0984e24e50353f5796c7ee3719cbd68b418e8
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Fri Dec 27 20:01:54 2013 +0200
sudoers: recognize #include and #includedir directives
sudoers-include.patch | 28 ++++++++++++++++++++++++++++
vim.spec | 4 +++-
2 files changed, 31 insertions(+), 1 deletion(-)
---
diff --git a/vim.spec b/vim.spec
index 5e46e0a..92987d2 100644
--- a/vim.spec
+++ b/vim.spec
@@ -97,6 +97,7 @@ Patch21: %{name}-filetypes.patch
Patch22: %{name}-man_installation.patch
Patch23: %{name}-vimrc.patch
Patch24: %{name}-syntax-exports.patch
+Patch25: sudoers-include.patch
Patch102: %{name}-gtkfilechooser.patch
Patch104: %{name}-home_etc.patch
@@ -129,8 +130,8 @@ BuildRequires: gtk+2-devel >= 2:2.6.0
%if %{with selinux} || %{with heavy}
BuildRequires: libselinux-devel
%endif
-BuildRequires: ncurses-devel
%{?with_motif:BuildRequires: motif-devel}
+BuildRequires: ncurses-devel
BuildRequires: pkgconfig
%if %{with perl} || %{with heavy}
BuildRequires: perl-devel
@@ -749,6 +750,7 @@ jak również GUI GTK+2.
%patch22 -p1
%patch23 -p1
%patch24 -p1
+%patch25 -p1
# home etc
%{?with_home_etc:%patch104 -p1}
diff --git a/sudoers-include.patch b/sudoers-include.patch
new file mode 100644
index 0000000..804287f
--- /dev/null
+++ b/sudoers-include.patch
@@ -0,0 +1,28 @@
+--- vim74/runtime/syntax/sudoers.vim 2011-02-25 15:05:44.000000000 +0200
++++ vim74/runtime/syntax/sudoers.vim 2013-12-27 20:00:19.631344071 +0200
+@@ -23,7 +23,7 @@
+
+ syn keyword sudoersTodo contained TODO FIXME XXX NOTE
+
+-syn region sudoersComment display oneline start='#' end='$' contains=sudoersTodo
++syn region sudoersComment display oneline start='#' end='$' contains=sudoersTodo,sudoersIncludeDirective
+
+ syn keyword sudoersAlias User_Alias Runas_Alias nextgroup=sudoersUserAlias skipwhite skipnl
+ syn keyword sudoersAlias Host_Alias nextgroup=sudoersHostAlias skipwhite skipnl
+@@ -142,6 +142,8 @@
+ syn match sudoersCommandArgsInSpec contained '[^[:space:],:=\\]\+\%(\\[[:space:],:=\\][^[:space:],:=\\]*\)*' nextgroup=sudoersCommandArgsInSpec, at sudoersCmndSpec skipwhite
+ syn match sudoersCommandEmptyInSpec contained '""' nextgroup=@sudoersCmndSpec skipwhite skipnl
+
++syn match sudoersIncludeDirective '^#include\%(dir\)\=' nextgroup=sudoersStringParameter,sudoersListParameter
++
+ syn keyword sudoersDefaultEntry Defaults nextgroup=sudoersDefaultTypeAt,sudoersDefaultTypeColon,sudoersDefaultTypeGreaterThan, at sudoersParameter skipwhite skipnl
+ syn match sudoersDefaultTypeAt contained '@' nextgroup=@sudoersHost skipwhite skipnl
+ syn match sudoersDefaultTypeColon contained ':' nextgroup=@sudoersUser skipwhite skipnl
+@@ -320,6 +322,7 @@
+ hi def link sudoersCommandArgs String
+ hi def link sudoersCommandEmpty Special
+ hi def link sudoersDefaultEntry Keyword
++hi def link sudoersIncludeDirective Special
+ hi def link sudoersDefaultTypeAt Special
+ hi def link sudoersDefaultTypeColon Special
+ hi def link sudoersDefaultTypeGreaterThan Special
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/1e6bfbec0fdc4527d46bd6ca979283a5120db0c7
More information about the pld-cvs-commit
mailing list