Compare commits
49 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| d4764cc270 | |||
| ac60d9e686 | |||
| 4cbb0249d3 | |||
| a54e92c25c | |||
| 3e861503a4 | |||
| cbf1109c0c | |||
| 5ddbd5060b | |||
| 4aa8330b7f | |||
| d5076d7bee | |||
| 57a642d968 | |||
| 5de95f8fdf | |||
| 7a60ffe186 | |||
| 9fcef805ca | |||
| 6013af887d | |||
| 3c896b6a2a | |||
| 4091cad0aa | |||
| 63e48f4320 | |||
| 3851b0830c | |||
| 961ca11fa7 | |||
| a6552fe8c0 | |||
| 9837a872ba | |||
| 16b2eea69d | |||
| c34e9f3c3b | |||
| f7d5c80ca9 | |||
| e66351c6c8 | |||
| 216b1a61eb | |||
| e023928171 | |||
| 37302e5984 | |||
| 39b108f35b | |||
| 3f6315c286 | |||
| 10352ffd4d | |||
| 29a9021087 | |||
| f1e9f07ec1 | |||
| 06ac688ceb | |||
| 3d0de82f1f | |||
| 9f3648e438 | |||
| ab99f07abc | |||
| 6df73c8145 | |||
| 464cf0e172 | |||
| 59ff34a298 | |||
| 15266cef9f | |||
| 5e9f7dac30 | |||
| e67ab2a476 | |||
| db8a755b74 | |||
| a0c0895a0b | |||
| b580126c0c | |||
| e58844e88a | |||
| 4688c7c793 | |||
| 6392b4215c |
45
apparmor.vim
45
apparmor.vim
@@ -3,7 +3,7 @@
|
||||
|
||||
" ----------------------------------------------------------------------
|
||||
" Copyright (c) 2005 Novell, Inc. All Rights Reserved.
|
||||
" Copyright (c) 2006-2012 Christian Boltz. All Rights Reserved.
|
||||
" Copyright (c) 2006-2023 Christian Boltz. All Rights Reserved.
|
||||
"
|
||||
" This program is free software; you can redistribute it and/or
|
||||
" modify it under the terms of version 2 of the GNU General Public
|
||||
@@ -17,14 +17,9 @@
|
||||
" You should have received a copy of the GNU General Public License
|
||||
" along with this program; if not, contact Novell, Inc.
|
||||
"
|
||||
" To contact Novell about this file by physical or electronic mail,
|
||||
" you may find current contact information at www.novell.com.
|
||||
"
|
||||
" To contact Christian Boltz about this file by physical or electronic
|
||||
" mail, you may find current contact information at www.cboltz.de/en/kontakt.
|
||||
"
|
||||
" If you want to report a bug via bugzilla.novell.com, please assign it
|
||||
" to suse-beta[AT]cboltz.de (replace [AT] with @).
|
||||
" If you want to report a bug for apparmor.vim, please do so at
|
||||
" - https://gitlab.com/apparmor/apparmor/ or
|
||||
" - https://bugzilla.opensuse.org (assign it to suse-beta[AT]cboltz.de)
|
||||
" ----------------------------------------------------------------------
|
||||
"
|
||||
" stick this file into ~/.vim/syntax/ and add these commands into your .vimrc
|
||||
@@ -52,6 +47,7 @@ syntax case match
|
||||
" hi sdComment2 ctermfg=darkblue
|
||||
hi sdGlob ctermfg=darkmagenta
|
||||
hi sdAlias ctermfg=darkmagenta
|
||||
hi sdAll ctermfg=darkred ctermbg=yellow
|
||||
hi sdEntryWriteExec ctermfg=black ctermbg=yellow
|
||||
hi sdEntryUX ctermfg=darkred cterm=underline
|
||||
hi sdEntryUXe ctermfg=darkred
|
||||
@@ -67,6 +63,7 @@ syntax case match
|
||||
hi sdCapKey cterm=underline ctermfg=lightblue
|
||||
hi sdCapDanger ctermfg=darkred
|
||||
hi sdRLimit ctermfg=lightblue
|
||||
hi sdUserns ctermfg=darkred
|
||||
hi def link sdEntryR Normal
|
||||
hi def link sdEntryK Normal
|
||||
hi def link sdFlags Normal
|
||||
@@ -112,7 +109,7 @@ syn match sdError /^.*$/ contains=sdComment "highlight all non-valid lines as er
|
||||
|
||||
" TODO: the sdGlob pattern is not anchored with ^ and $, so it matches all lines matching ^@{...}.*
|
||||
" This allows incorrect lines also and should be checked better.
|
||||
" This also (accidently ;-) includes variable definitions (@{FOO}=/bar)
|
||||
" This also (accidentally ;-) includes variable definitions (@{FOO}=/bar)
|
||||
" TODO: make a separate pattern for variable definitions, then mark sdGlob as contained
|
||||
syn match sdGlob /\v\?|\*|\{.*,.*\}|[[^\]]\+\]|\@\{[a-zA-Z][a-zA-Z0-9_]*\}/
|
||||
|
||||
@@ -120,11 +117,18 @@ syn match sdAlias /\v^\s*alias\s+(\/|\@\{\S*\})\S*\s+-\>\s+(\/|\@\{\S*\})\S*\s*,
|
||||
|
||||
" syn match sdComment /#.*/
|
||||
|
||||
syn cluster sdEntry contains=sdEntryWriteExec,sdEntryR,sdEntryW,sdEntryIX,sdEntryPX,sdEntryPXe,sdEntryUX,sdEntryUXe,sdEntryM,sdCap,sdSetCap,sdExtHat,sdRLimit,sdNetwork,sdNetworkDanger,sdEntryChangeProfile
|
||||
" List of all (supported) rules inside a profile.
|
||||
" XXX When adding support for a new rule type, also add it here. XXX
|
||||
" XXX Otherwise it will be highlighted as an error. XXX
|
||||
syn cluster sdEntry contains=sdAll,sdEntryWriteExec,sdEntryR,sdEntryW,sdEntryIX,sdEntryPX,sdEntryPXe,sdEntryUX,sdEntryUXe,sdEntryM,sdCap,sdSetCap,sdExtHat,sdRLimit,sdNetwork,sdNetworkDanger,sdEntryChangeProfile,sdUserns
|
||||
|
||||
|
||||
" TODO: support audit and deny keywords for all rules (not only for files)
|
||||
" TODO: higlight audit and deny keywords everywhere
|
||||
" TODO: highlight audit and deny keywords everywhere
|
||||
|
||||
" 'all' rule
|
||||
syn match sdAll /\v^\s*(audit\s+)?(deny\s+|allow\s+)?all\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
|
||||
|
||||
|
||||
" Capability line
|
||||
|
||||
@@ -162,10 +166,13 @@ syn match sdRLimit /\v^\s*set\s+rlimit\s+(nofile|ofile|nproc|rtprio)\s+\<\=\s+[0
|
||||
syn match sdRLimit /\v^\s*set\s+rlimit\s+(locks|sigpending)\s+\<\=\s+[0-9]+\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
|
||||
syn match sdRLimit /\v^\s*set\s+rlimit\s+(fsize|data|stack|core|rss|as|memlock|msgqueue)\s+\<\=\s+[0-9]+([KMG]B)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
|
||||
syn match sdRLimit /\v^\s*set\s+rlimit\s+nice\s+\<\=\s+(-1?[0-9]|-20|1?[0-9])\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
|
||||
syn match sdRLimit /\v^\s*set\s+rlimit\s+cpu\s+\<\=\s+[0-9]+(seconds|minutes|hours|days)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
|
||||
syn match sdRLimit /\v^\s*set\s+rlimit\s+rttime\s+\<\=\s+[0-9]+(ms|seconds|minutes)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
|
||||
syn match sdRLimit /\v^\s*set\s+rlimit\s+cpu\s+\<\=\s+[0-9]+\s*(s|sec|second|seconds|min|minute|minutes|h|hour|hours|d|day|days|week|weeks)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
|
||||
syn match sdRLimit /\v^\s*set\s+rlimit\s+rttime\s+\<\=\s+[0-9]+\s*(us|microsecond|microseconds|ms|millisecond|milliseconds|s|sec|second|seconds|min|minute|minutes|h|hour|hours|d|day|days|week|weeks)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
|
||||
syn match sdRLimit /\v^\s*set\s+rlimit\s+(cpu|rttime|nofile|nproc|rtprio|locks|sigpending|fsize|data|stack|core|rss|as|memlock|msgqueue|nice)\s+\<\=\s+infinity\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment
|
||||
|
||||
" userns
|
||||
syn match sdUserns /\v^\s*(audit\s+)?(deny\s+|allow\s+)?userns(\s+create)?\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdComment nextgroup=@sdEntry,sdComment,sdError,sdInclude
|
||||
|
||||
" link rules
|
||||
syn match sdEntryW /\v^\s+(audit\s+)?(deny\s+|allow\s+)?(owner\s+|other\s+)?link\s+(subset\s+)?(\/|\@\{\S*\})\S*\s+-\>\s+(\/|\@\{\S*\})\S*\s*,(\s*$|(\s*#.*$)\@=)/ contains=sdGlob,sdComment
|
||||
|
||||
@@ -175,14 +182,14 @@ syn match sdExtHat /\v^\s+(\^|hat\s+|profile\s+)\S+\s*,(\s*$|(\s*#.*$)\@=)/ con
|
||||
|
||||
|
||||
|
||||
syn match sdProfileName /\v^((profile\s+)?\/\S+|profile\s+([a-zA-Z0-9]\S*\s)?\S+)\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)=\{/ contains=sdProfileStart,sdHatName,sdFlags,sdComment,sdGlob
|
||||
syn match sdProfileName /\v^((profile\s+)?\/\S+|profile\s+([a-zA-Z0-9]\S*\s)?\S+)\s+((flags\s*\=\s*)?\(\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)=\{/ contains=sdProfileStart,sdHatName,sdFlags,sdComment,sdGlob
|
||||
syn match sdProfileStart /{/ contained
|
||||
syn match sdProfileEnd /^}\s*(#.*)?$/ contained " TODO: syn region does not (yet?) allow usage of comment in end=
|
||||
" TODO: Removing the $ mark from end= will allow non-comments also :-(
|
||||
syn match sdHatName /\v^\s+(\^|hat\s+|profile\s+)\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)=\{/ contains=sdProfileStart,sdFlags,sdComment
|
||||
syn match sdHatName /\v^\s+(\^|hat\s+|profile\s+)\S+\s+((flags\s*\=\s*)?\(\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)=\{/ contains=sdProfileStart,sdFlags,sdComment
|
||||
syn match sdHatStart /{/ contained
|
||||
syn match sdHatEnd /}/ contained " TODO: allow comments + [same as for syn match sdProfileEnd]
|
||||
syn match sdFlags /\v((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)/ contained contains=sdFlagKey
|
||||
syn match sdFlags /\v((flags\s*\=\s*)?\(\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)/ contained contains=sdFlagKey
|
||||
|
||||
syn match sdComment /\s*#.*$/
|
||||
" NOTE: contains=sdComment changes #include highlighting to comment color.
|
||||
@@ -196,8 +203,8 @@ syn match sdInclude /\s*abi\s<\S*>\s*,/ contains=sdComment " TODO: doesn't chec
|
||||
|
||||
" basic profile block...
|
||||
" \s+ does not work in end=, therefore using \s\s*
|
||||
syn region Normal start=/\v^(profile\s+)?\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)=\{/ matchgroup=sdProfileEnd end=/^}\s*$/ contains=sdProfileName,Hat,@sdEntry,sdComment,sdError,sdInclude
|
||||
syn region Hat start=/\v^\s+(\^|hat\s+|profile\s+)\S+\s+((flags\s*\=\s*)?\(\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)=\{/ matchgroup=sdHatEnd end=/^\s\s*}\s*$/ contains=sdHatName,@sdEntry,sdComment,sdError,sdInclude
|
||||
syn region Normal start=/\v^(profile\s+)?\S+\s+((flags\s*\=\s*)?\(\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)=\{/ matchgroup=sdProfileEnd end=/^}\s*$/ contains=sdProfileName,Hat,@sdEntry,sdComment,sdError,sdInclude
|
||||
syn region Hat start=/\v^\s+(\^|hat\s+|profile\s+)\S+\s+((flags\s*\=\s*)?\(\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted)(\s*,\s*(complain|unconfined|audit|attach_disconnected|no_attach_disconnected|chroot_attach|chroot_no_attach|chroot_relative|namespace_relative|mediate_deleted|delegate_deleted))*\s*\)\s+)=\{/ matchgroup=sdHatEnd end=/^\s\s*}\s*$/ contains=sdHatName,@sdEntry,sdComment,sdError,sdInclude
|
||||
|
||||
" file permissions
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
Encoding=UTF-8
|
||||
Name=Vi IMproved
|
||||
Categories=GTK;Application;Utility;TextEditor;
|
||||
Keywords=editor;gvim;vim;
|
||||
GenericName=Text Editor
|
||||
MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
|
||||
Exec=gvim -f %f
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package specRPM_CREATION_NAME
|
||||
#
|
||||
# Copyright (c) specCURRENT_YEAR SUSE LLC
|
||||
# Copyright (c) specCURRENT_YEAR SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/runtime/filetype.vim
|
||||
Index: vim-9.1.1706/runtime/filetype.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/filetype.vim
|
||||
+++ vim-8.2.2411/runtime/filetype.vim
|
||||
@@ -320,6 +320,9 @@ au BufNewFile,BufRead *.css setf css
|
||||
--- vim-9.1.1706.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.1706/runtime/filetype.vim
|
||||
@@ -462,6 +462,9 @@ au BufNewFile,BufRead *.css setf css
|
||||
" Century Term Command Scripts (*.cmd too)
|
||||
au BufNewFile,BufRead *.con setf cterm
|
||||
|
||||
@@ -12,10 +12,10 @@ Index: vim-8.2.2411/runtime/filetype.vim
|
||||
" Changelog
|
||||
au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
|
||||
\ setf debchangelog
|
||||
Index: vim-8.2.2411/runtime/syntax/changes.vim
|
||||
Index: vim-9.1.1706/runtime/syntax/changes.vim
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ vim-8.2.2411/runtime/syntax/changes.vim
|
||||
+++ vim-9.1.1706/runtime/syntax/changes.vim
|
||||
@@ -0,0 +1,41 @@
|
||||
+" Vim syntax file
|
||||
+" Filename: changes.vim
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-9.1.0330/runtime/filetype.vim
|
||||
Index: vim-9.1.1706/runtime/filetype.vim
|
||||
===================================================================
|
||||
--- vim-9.1.0330.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.0330/runtime/filetype.vim
|
||||
@@ -2313,6 +2313,10 @@ au BufNewFile,BufRead *.stp setf stp
|
||||
--- vim-9.1.1706.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.1706/runtime/filetype.vim
|
||||
@@ -2569,6 +2569,10 @@ au BufNewFile,BufRead *.stp setf stp
|
||||
" Standard ML
|
||||
au BufNewFile,BufRead *.sml setf sml
|
||||
|
||||
@@ -13,10 +13,10 @@ Index: vim-9.1.0330/runtime/filetype.vim
|
||||
" Sratus VOS command macro
|
||||
au BufNewFile,BufRead *.cm setf voscm
|
||||
|
||||
Index: vim-9.1.0330/runtime/syntax/ftl.vim
|
||||
Index: vim-9.1.1706/runtime/syntax/ftl.vim
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ vim-9.1.0330/runtime/syntax/ftl.vim
|
||||
+++ vim-9.1.1706/runtime/syntax/ftl.vim
|
||||
@@ -0,0 +1,36 @@
|
||||
+" Vim syntax file
|
||||
+" Language: FreeMarker Template Language (FTL)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-9.1.0151/runtime/filetype.vim
|
||||
Index: vim-9.1.1706/runtime/filetype.vim
|
||||
===================================================================
|
||||
--- vim-9.1.0151.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.0151/runtime/filetype.vim
|
||||
@@ -2122,7 +2122,7 @@ au BufRead,BufNewFile *.sol setf solid
|
||||
--- vim-9.1.1706.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.1706/runtime/filetype.vim
|
||||
@@ -2495,7 +2495,7 @@ au BufRead,BufNewFile *.sol setf solid
|
||||
au BufNewFile,BufRead *.rq,*.sparql setf sparql
|
||||
|
||||
" Spec (Linux RPM)
|
||||
@@ -11,11 +11,11 @@ Index: vim-9.1.0151/runtime/filetype.vim
|
||||
|
||||
" Speedup (AspenTech plant simulator)
|
||||
au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup
|
||||
Index: vim-9.1.0151/runtime/syntax/spec.vim
|
||||
Index: vim-9.1.1706/runtime/syntax/spec.vim
|
||||
===================================================================
|
||||
--- vim-9.1.0151.orig/runtime/syntax/spec.vim
|
||||
+++ vim-9.1.0151/runtime/syntax/spec.vim
|
||||
@@ -102,7 +102,7 @@ syn case ignore
|
||||
--- vim-9.1.1706.orig/runtime/syntax/spec.vim
|
||||
+++ vim-9.1.1706/runtime/syntax/spec.vim
|
||||
@@ -104,7 +104,7 @@ syn case ignore
|
||||
"%% PreAmble Section %%
|
||||
"Copyright and Serial were deprecated by License and Epoch
|
||||
syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/runtime/gvimrc_example.vim
|
||||
Index: vim-9.1.1706/runtime/gvimrc_example.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/gvimrc_example.vim
|
||||
+++ vim-8.2.2411/runtime/gvimrc_example.vim
|
||||
@@ -15,9 +15,6 @@
|
||||
--- vim-9.1.1706.orig/runtime/gvimrc_example.vim
|
||||
+++ vim-9.1.1706/runtime/gvimrc_example.vim
|
||||
@@ -16,9 +16,6 @@
|
||||
" Make external commands work through a pipe instead of a pseudo-tty
|
||||
"set noguipty
|
||||
|
||||
@@ -12,7 +12,7 @@ Index: vim-8.2.2411/runtime/gvimrc_example.vim
|
||||
set ch=2 " Make command line two lines high
|
||||
|
||||
set mousehide " Hide the mouse when typing text
|
||||
@@ -53,3 +50,29 @@ if version >= 500
|
||||
@@ -54,3 +51,29 @@ if version >= 500
|
||||
highlight Special gui=NONE guibg=grey95
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
Index: vim-8.2.2411/runtime/doc/Makefile
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/doc/Makefile
|
||||
+++ vim-8.2.2411/runtime/doc/Makefile
|
||||
@@ -331,6 +331,7 @@ CONVERTED = \
|
||||
all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man $(CONVERTED)
|
||||
|
||||
# Use Vim to generate the tags file. Can only be used when Vim has been
|
||||
+ export VIMRUNTIME=../; \
|
||||
# compiled and installed. Supports multiple languages.
|
||||
vimtags: $(DOCS)
|
||||
@$(VIMEXE) --clean -esX -V1 -u doctags.vim
|
||||
@@ -1,14 +1,15 @@
|
||||
Index: vim-8.2.2411/src/vimtutor
|
||||
Index: vim-9.1.1706/src/vimtutor
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/src/vimtutor
|
||||
+++ vim-8.2.2411/src/vimtutor
|
||||
@@ -24,8 +24,7 @@ xx=$1
|
||||
export xx
|
||||
--- vim-9.1.1706.orig/src/vimtutor
|
||||
+++ vim-9.1.1706/src/vimtutor
|
||||
@@ -159,9 +159,8 @@ done
|
||||
|
||||
|
||||
# We need a temp file for the copy. First try using a standard command.
|
||||
-tmp="${TMPDIR-/tmp}"
|
||||
-TUTORCOPY=`mktemp $tmp/tutorXXXXXX || tempfile -p tutor || echo none`
|
||||
+TUTORCOPY=`mktemp /tmp/tutorXXXXXX || echo /tmp/tutor$$`
|
||||
# shellcheck disable=SC2186
|
||||
-TUTORCOPY=$(mktemp "$tmp/tutorXXXXXX" || tempfile -p tutor || echo none)
|
||||
+TUTORCOPY=$(mktemp /tmp/tutorXXXXXX || echo /tmp/tutor$$)
|
||||
|
||||
# If the standard commands failed then create a directory to put the copy in.
|
||||
# That is a secure way to make a temp file.
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/src/feature.h
|
||||
Index: vim-9.1.1706/src/feature.h
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/src/feature.h
|
||||
+++ vim-8.2.2411/src/feature.h
|
||||
@@ -813,11 +813,12 @@
|
||||
--- vim-9.1.1706.orig/src/feature.h
|
||||
+++ vim-9.1.1706/src/feature.h
|
||||
@@ -704,11 +704,12 @@
|
||||
* SYS_VIMRC_FILE Name of the system-wide .vimrc file.
|
||||
*/
|
||||
// #define SYS_VIMRC_FILE "/etc/vimrc"
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
Index: vim-8.2.2411/runtime/syntax/sh.vim
|
||||
Index: vim-9.1.1706/runtime/syntax/sh.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/syntax/sh.vim
|
||||
+++ vim-8.2.2411/runtime/syntax/sh.vim
|
||||
@@ -74,6 +74,13 @@ if exists("b:is_dash")
|
||||
let b:is_posix= 1
|
||||
--- vim-9.1.1706.orig/runtime/syntax/sh.vim
|
||||
+++ vim-9.1.1706/runtime/syntax/sh.vim
|
||||
@@ -146,6 +146,13 @@ if exists("b:is_kornshell") || exists("b
|
||||
endif
|
||||
endif
|
||||
|
||||
+" Neither is_kornshell nor is_bash was explicitly set, and
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/src/po/Make_all.mak
|
||||
Index: vim-9.1.1706/src/po/Make_all.mak
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/src/po/Make_all.mak
|
||||
+++ vim-8.2.2411/src/po/Make_all.mak
|
||||
@@ -24,7 +24,6 @@ LANGUAGES = \
|
||||
--- vim-9.1.1706.orig/src/po/Make_all.mak
|
||||
+++ vim-9.1.1706/src/po/Make_all.mak
|
||||
@@ -26,7 +26,6 @@ LANGUAGES = \
|
||||
lv \
|
||||
nb \
|
||||
nl \
|
||||
@@ -10,7 +10,7 @@ Index: vim-8.2.2411/src/po/Make_all.mak
|
||||
pl \
|
||||
pl.UTF-8 \
|
||||
pl.cp1250 \
|
||||
@@ -109,7 +108,6 @@ MOFILES = \
|
||||
@@ -114,7 +113,6 @@ MOFILES = \
|
||||
lv.mo \
|
||||
nb.mo \
|
||||
nl.mo \
|
||||
@@ -18,7 +18,7 @@ Index: vim-8.2.2411/src/po/Make_all.mak
|
||||
pl.mo \
|
||||
pt_BR.mo \
|
||||
ru.mo \
|
||||
@@ -159,7 +157,6 @@ CHECKFILES = \
|
||||
@@ -167,7 +165,6 @@ CHECKFILES = \
|
||||
lv.ck \
|
||||
nb.ck \
|
||||
nl.ck \
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/runtime/filetype.vim
|
||||
Index: vim-9.1.1706/runtime/filetype.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/filetype.vim
|
||||
+++ vim-8.2.2411/runtime/filetype.vim
|
||||
@@ -104,6 +104,10 @@ au BufNewFile,BufRead *.ino,*.pde setf
|
||||
--- vim-9.1.1706.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.1706/runtime/filetype.vim
|
||||
@@ -124,6 +124,10 @@ au BufNewFile,BufRead *.asy setf asy
|
||||
au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf setf apache
|
||||
au BufNewFile,BufRead */etc/apache2/sites-*/*.com setf apache
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/runtime/filetype.vim
|
||||
Index: vim-9.1.1706/runtime/filetype.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/filetype.vim
|
||||
+++ vim-8.2.2411/runtime/filetype.vim
|
||||
@@ -17,7 +17,7 @@ augroup filetypedetect
|
||||
--- vim-9.1.1706.orig/runtime/filetype.vim
|
||||
+++ vim-9.1.1706/runtime/filetype.vim
|
||||
@@ -18,7 +18,7 @@ augroup filetypedetect
|
||||
|
||||
" Ignored extensions
|
||||
if exists("*fnameescape")
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
Index: vim-9.0.1188/runtime/syntax/fstab.vim
|
||||
===================================================================
|
||||
--- vim-9.0.1188.orig/runtime/syntax/fstab.vim
|
||||
+++ vim-9.0.1188/runtime/syntax/fstab.vim
|
||||
@@ -35,7 +35,7 @@ syn match fsOperator /[,=:#]/
|
||||
" Device
|
||||
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
|
||||
syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
|
||||
-syn keyword fsDeviceKeyword contained none proc linproc tmpfs devpts devtmpfs sysfs usbfs
|
||||
+syn keyword fsDeviceKeyword contained none proc linproc tmpfs debugfs devpts devtmpfs sysfs usbfs
|
||||
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
|
||||
syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
|
||||
syn keyword fsDeviceKeyword contained PARTLABEL nextgroup=fsDevicePARTLABEL
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/runtime/defaults.vim
|
||||
Index: vim-9.1.1706/runtime/defaults.vim
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/runtime/defaults.vim
|
||||
+++ vim-8.2.2411/runtime/defaults.vim
|
||||
@@ -77,13 +77,15 @@ inoremap <C-U> <C-G>u<C-U>
|
||||
--- vim-9.1.1706.orig/runtime/defaults.vim
|
||||
+++ vim-9.1.1706/runtime/defaults.vim
|
||||
@@ -73,13 +73,15 @@ inoremap <C-U> <C-G>u<C-U>
|
||||
" can position the cursor, Visually select and scroll with the mouse.
|
||||
" Only xterm can grab the mouse events when using the shift key, for other
|
||||
" terminals use ":", select text and press Esc.
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/src/main.c
|
||||
Index: vim-9.1.1706/src/main.c
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/src/main.c
|
||||
+++ vim-8.2.2411/src/main.c
|
||||
@@ -3130,7 +3130,10 @@ source_startup_scripts(mparm_T *parmp)
|
||||
--- vim-9.1.1706.orig/src/main.c
|
||||
+++ vim-9.1.1706/src/main.c
|
||||
@@ -3364,7 +3364,10 @@ source_startup_scripts(mparm_T *parmp)
|
||||
* Get system wide defaults, if the file name is defined.
|
||||
*/
|
||||
#ifdef SYS_VIMRC_FILE
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d76ed5d1191b5c76fe7195125c9975d78c92a54254b8b5d377c6caf5739da259
|
||||
size 17919981
|
||||
71
vim-9.1.1134-revert-putty-terminal-colors.patch
Normal file
71
vim-9.1.1134-revert-putty-terminal-colors.patch
Normal file
@@ -0,0 +1,71 @@
|
||||
From b16c218964d2024a5c52f251a49c9d71da63f9a0 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Jungblut Schreiner <martinjungblut@gmail.com>
|
||||
Date: Wed, 5 Mar 2025 17:07:19 -0300
|
||||
Subject: [PATCH] Revert "runtime(defaults): Detect putty terminal and switch
|
||||
to dark background"
|
||||
|
||||
This reverts commit 2abec431e1ab5f4f6e21c2bb490241732622a8c5.
|
||||
---
|
||||
runtime/defaults.vim | 5 -----
|
||||
runtime/doc/autocmd.txt | 17 ++++-------------
|
||||
runtime/doc/version9.txt | 3 +++
|
||||
src/testdir/test_cmdline.vim | 2 --
|
||||
4 files changed, 7 insertions(+), 20 deletions(-)
|
||||
|
||||
Index: vim-9.1.1706/runtime/defaults.vim
|
||||
===================================================================
|
||||
--- vim-9.1.1706.orig/runtime/defaults.vim
|
||||
+++ vim-9.1.1706/runtime/defaults.vim
|
||||
@@ -112,11 +112,6 @@ if 1
|
||||
\ | execute "normal! g`\""
|
||||
\ | endif
|
||||
|
||||
- " Set the default background for putty to dark. Putty usually sets the
|
||||
- " $TERM to xterm and by default it starts with a dark background which
|
||||
- " makes syntax highlighting often hard to read with bg=light
|
||||
- " undo this using: ":au! vimStartup TermResponse"
|
||||
- autocmd TermResponse * if v:termresponse == "\e[>0;136;0c" | set bg=dark | endif
|
||||
augroup END
|
||||
|
||||
" Quite a few people accidentally type "q:" instead of ":q" and get confused
|
||||
Index: vim-9.1.1706/runtime/doc/autocmd.txt
|
||||
===================================================================
|
||||
--- vim-9.1.1706.orig/runtime/doc/autocmd.txt
|
||||
+++ vim-9.1.1706/runtime/doc/autocmd.txt
|
||||
@@ -1291,19 +1291,10 @@ TerminalWinOpen Just after a terminal
|
||||
TermResponse After the response to |t_RV| is received from
|
||||
the terminal. The value of |v:termresponse|
|
||||
can be used to do things depending on the
|
||||
- terminal version.
|
||||
- This is used in |defaults.vim| to detect
|
||||
- putty terminal and set a dark background: >
|
||||
-
|
||||
- au TermResponse *
|
||||
- \ if v:termresponse == "\e[>0;136;0c"
|
||||
- \ set bg=dark
|
||||
- \ endif
|
||||
-<
|
||||
- Note: that this event may be triggered halfway
|
||||
- executing another event, especially if file
|
||||
- I/O, a shell command or anything else that
|
||||
- takes time is involved.
|
||||
+ terminal version. Note that this event may be
|
||||
+ triggered halfway executing another event,
|
||||
+ especially if file I/O, a shell command or
|
||||
+ anything else that takes time is involved.
|
||||
*TermResponseAll*
|
||||
TermResponseAll After the response to |t_RV|, |t_RC|, |t_RS|,
|
||||
|t_u7| or any OSC command are received from
|
||||
Index: vim-9.1.1706/src/testdir/test_cmdline.vim
|
||||
===================================================================
|
||||
--- vim-9.1.1706.orig/src/testdir/test_cmdline.vim
|
||||
+++ vim-9.1.1706/src/testdir/test_cmdline.vim
|
||||
@@ -1899,8 +1899,6 @@ func Test_verbose_option()
|
||||
CheckScreendump
|
||||
|
||||
let lines =<< trim [SCRIPT]
|
||||
- " clear the TermResponse autocommand from defaults.vim
|
||||
- au! vimStartup TermResponse
|
||||
command DoSomething echo 'hello' |set ts=4 |let v = '123' |echo v
|
||||
call feedkeys("\r", 't') " for the hit-enter prompt
|
||||
set verbose=20
|
||||
3
vim-9.1.1754.tar.gz
Normal file
3
vim-9.1.1754.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bf03ae800f9c03749ea6fe659321049b77eda2af93217eeb7c5c6457609e90e8
|
||||
size 18786233
|
||||
3419
vim.changes
3419
vim.changes
File diff suppressed because it is too large
Load Diff
57
vim.spec
57
vim.spec
@@ -1,7 +1,8 @@
|
||||
#
|
||||
# spec file for package vim
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -17,7 +18,7 @@
|
||||
|
||||
|
||||
%define pkg_version 9.1
|
||||
%define patchlevel 0470
|
||||
%define patchlevel 1754
|
||||
%define patchlevel_compact %{patchlevel}
|
||||
%define VIM_SUBDIR vim91
|
||||
%define site_runtimepath %{_datadir}/vim/site
|
||||
@@ -60,23 +61,22 @@ Source31: gvim_256.png
|
||||
Source32: gvim_512.png
|
||||
# /Section
|
||||
Source99: %{name}-7.4-rpmlintrc
|
||||
Patch3: %{name}-7.4-disable_lang_no.patch
|
||||
Patch4: %{name}-7.3-gvimrc_fontset.patch
|
||||
Patch5: %{name}-7.4-highlight_fstab.patch
|
||||
Patch6: %{name}-7.3-sh_is_bash.patch
|
||||
Patch7: %{name}-7.3-filetype_ftl.patch
|
||||
Patch8: %{name}-7.3-help_tags.patch
|
||||
Patch9: %{name}-7.3-use_awk.patch
|
||||
Patch10: %{name}-7.3-name_vimrc.patch
|
||||
Patch11: %{name}-7.3-mktemp_tutor.patch
|
||||
Patch15: %{name}-7.4-filetype_apparmor.patch
|
||||
Patch18: %{name}-7.3-filetype_spec.patch
|
||||
Patch21: %{name}-7.3-filetype_changes.patch
|
||||
Patch22: %{name}-7.4-filetype_mine.patch
|
||||
Patch100: vim73-no-static-libpython.patch
|
||||
Patch101: vim-8.0.1568-defaults.patch
|
||||
Patch104: vim-8.2.2411-globalvimrc.patch
|
||||
BuildRequires: autoconf
|
||||
Patch1: %{name}-7.4-disable_lang_no.patch
|
||||
Patch2: %{name}-7.3-gvimrc_fontset.patch
|
||||
Patch3: %{name}-7.3-sh_is_bash.patch
|
||||
Patch4: %{name}-7.3-filetype_ftl.patch
|
||||
Patch5: %{name}-7.3-use_awk.patch
|
||||
Patch6: %{name}-7.3-name_vimrc.patch
|
||||
Patch7: %{name}-7.3-mktemp_tutor.patch
|
||||
Patch8: %{name}-7.4-filetype_apparmor.patch
|
||||
Patch9: %{name}-7.3-filetype_spec.patch
|
||||
Patch10: %{name}-7.3-filetype_changes.patch
|
||||
Patch11: %{name}-7.4-filetype_mine.patch
|
||||
Patch12: %{name}73-no-static-libpython.patch
|
||||
Patch13: %{name}-8.0.1568-defaults.patch
|
||||
Patch14: %{name}-8.2.2411-globalvimrc.patch
|
||||
Patch15: %{name}-9.1.1134-revert-putty-terminal-colors.patch
|
||||
BuildRequires: autoconf >= 2.71
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: gettext-devel
|
||||
@@ -210,23 +210,22 @@ a hex dump back to its original binary form.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{pkg_version}.%{patchlevel}
|
||||
|
||||
%patch -P 1 -p1
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
%patch -P 6 -p1
|
||||
%patch -P 7 -p1
|
||||
cp %{SOURCE23} runtime/syntax/apparmor.vim
|
||||
%patch -P 8 -p1
|
||||
%patch -P 9 -p1
|
||||
%patch -P 10 -p1
|
||||
%patch -P 11 -p1
|
||||
cp %{SOURCE23} runtime/syntax/apparmor.vim
|
||||
%patch -P 12 -p1
|
||||
%patch -P 13 -p1
|
||||
%patch -P 14 -p1
|
||||
%patch -P 15 -p1
|
||||
%patch -P 18 -p1
|
||||
%patch -P 21 -p1
|
||||
%patch -P 22 -p1
|
||||
%patch -P 100 -p1
|
||||
%patch -P 101 -p1
|
||||
%patch -P 104 -p1
|
||||
cp %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE8} %{SOURCE10} .
|
||||
|
||||
%build
|
||||
@@ -278,7 +277,7 @@ export NOGUI_OPTIONS="\
|
||||
"
|
||||
|
||||
pushd src
|
||||
autoconf
|
||||
make autoconf
|
||||
popd
|
||||
|
||||
# build smaller vim
|
||||
@@ -418,6 +417,10 @@ install -D -m 0644 \
|
||||
vimrc_example1 vimrc_example2 suse.vimrc \
|
||||
README.txt READMEdir/README_src.txt READMEdir/README_unix.txt \
|
||||
%{buildroot}%{_docdir}/vim/
|
||||
|
||||
rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/LICENSE
|
||||
rm -f %{buildroot}%{_datadir}/vim/%{VIM_SUBDIR}/README.txt
|
||||
|
||||
# gvim
|
||||
install -D -m 0644 \
|
||||
README.Japanese-XIM runtime/gvimrc_example.vim suse.gvimrc \
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
Index: vim-8.2.2411/src/configure.ac
|
||||
Index: vim-9.1.1706/src/configure.ac
|
||||
===================================================================
|
||||
--- vim-8.2.2411.orig/src/configure.ac
|
||||
+++ vim-8.2.2411/src/configure.ac
|
||||
@@ -1289,7 +1289,7 @@ eof
|
||||
--- vim-9.1.1706.orig/src/configure.ac
|
||||
+++ vim-9.1.1706/src/configure.ac
|
||||
@@ -1416,7 +1416,7 @@ eof
|
||||
vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
|
||||
fi
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user