summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-11-16 16:38:42 +0000
committerBram Moolenaar <Bram@vim.org>2021-11-16 16:38:42 +0000
commitc143fa0778fa0d8744867318bb7f7a2e63cf37d7 (patch)
tree3d071dca57ef102bf085aae06b30f749425c4223
parentb1b163efd7bb3ca68cce101d4e431559d2944a8e (diff)
downloadvim-git-c143fa0778fa0d8744867318bb7f7a2e63cf37d7.tar.gz
patch 8.2.3604: not all sudoers files are recognizedv8.2.3604
Problem: Not all sudoers files are recognized. Solution: Add a file pattern. (Doug Kearns, closes #1192)
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim2
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 875823c48..2a75126e4 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2307,6 +2307,9 @@ au BufNewFile,BufRead .bashrc*,.bash[_-]profile*,.bash[_-]logout*,.bash[_-]alias
au BufNewFile,BufRead .kshrc* call dist#ft#SetFileTypeSH("ksh")
au BufNewFile,BufRead .profile* call dist#ft#SetFileTypeSH(getline(1))
+" Sudoers
+au BufNewFile,BufRead */etc/sudoers.d/* call s:StarSetf('sudoers')
+
" tcsh scripts ending in a star
au BufNewFile,BufRead .tcshrc* call dist#ft#SetFileTypeShell("tcsh")
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 6376334f0..6134b328d 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -482,7 +482,7 @@ let s:filename_checks = {
\ 'st': ['file.st'],
\ 'stata': ['file.ado', 'file.do', 'file.imata', 'file.mata'],
\ 'stp': ['file.stp'],
- \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers'],
+ \ 'sudoers': ['any/etc/sudoers', 'sudoers.tmp', '/etc/sudoers', 'any/etc/sudoers.d/file'],
\ 'svg': ['file.svg'],
\ 'svn': ['svn-commitfile.tmp', 'svn-commit-file.tmp', 'svn-commit.tmp'],
\ 'swift': ['file.swift'],
diff --git a/src/version.c b/src/version.c
index 1c8c955b6..c96c2338e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3604,
+/**/
3603,
/**/
3602,