From 6c638c97c528bb062f6c84a511340413a217e742 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 3 May 2020 19:27:57 +0000 Subject: [PATCH] Merge branch 'cboltz-vim-if-exists' into 'master' apparmor.vim: support 'include if exists' See merge request apparmor/apparmor!500 Acked-by: John Johansen for 2.12..master (cherry picked from commit a4864146e2d5b39bdc9635507f784fb5a268212b) efa7c6d6 apparmor.vim: support 'include if exists' --- utils/vim/apparmor.vim.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils/vim/apparmor.vim.in b/utils/vim/apparmor.vim.in index 6451aa08c..94604ff6a 100644 --- a/utils/vim/apparmor.vim.in +++ b/utils/vim/apparmor.vim.in @@ -186,6 +186,8 @@ syn match sdComment /\s*#.*$/ " NOTE: Comment highlighting still works without contains=sdComment. syn match sdInclude /\s*#include\s<\S*>/ " TODO: doesn't check until $ syn match sdInclude /\s*include\s<\S*>/ " TODO: doesn't check until $ +syn match sdInclude /\s*#include\sif\sexists\s<\S*>/ " TODO: doesn't check until $ +syn match sdInclude /\s*include\sif\sexists\s<\S*>/ " TODO: doesn't check until $ " basic profile block... " \s+ does not work in end=, therefore using \s\s*