aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-05-11 23:56:53 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-05-11 23:57:29 -0400
commit076b0949d045d19decb2625c04128200ce8a987f (patch)
treec93a5bd60fcbe64faf230f8c5ef508e0ab01482a
parentadcabb73bc48732df420e9de7b067ebba2f25f55 (diff)
downloadrneovim-076b0949d045d19decb2625c04128200ce8a987f.tar.gz
rneovim-076b0949d045d19decb2625c04128200ce8a987f.tar.bz2
rneovim-076b0949d045d19decb2625c04128200ce8a987f.zip
vim-patch:8.2.0736: some files not recognized as pamenv
Problem: Some files not recognized as pamenv. Solution: Add pam_inv.conf. (closes vim/vim#6065) https://github.com/vim/vim/commit/aacc6afdb8cdeb2558e6942dcd65ca0079bec1ee
-rw-r--r--runtime/filetype.vim2
-rw-r--r--src/nvim/testdir/test_filetype.vim2
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f2ae298b48..0b5003dc44 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1130,7 +1130,7 @@ au BufNewFile,BufRead pf.conf setf pf
au BufNewFile,BufRead */etc/pam.conf setf pamconf
" Pam environment
-au BufNewFile,BufRead .pam_environment setf pamenv
+au BufNewFile,BufRead pam_env.conf,.pam_environment setf pamenv
" PApp
au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 4ca2e82ce1..ace56a375f 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -321,7 +321,7 @@ let s:filename_checks = {
\ 'openroad': ['file.or'],
\ 'ora': ['file.ora'],
\ 'pamconf': ['/etc/pam.conf'],
- \ 'pamenv': ['/home/user/.pam_environment'],
+ \ 'pamenv': ['/etc/security/pam_env.conf', '/home/user/.pam_environment'],
\ 'papp': ['file.papp', 'file.pxml', 'file.pxsl'],
\ 'pascal': ['file.pas', 'file.dpr'],
\ 'passwd': ['any/etc/passwd', 'any/etc/passwd-', 'any/etc/passwd.edit', 'any/etc/shadow', 'any/etc/shadow-', 'any/etc/shadow.edit', 'any/var/backups/passwd.bak', 'any/var/backups/shadow.bak'],