diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-11 19:46:36 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-11 19:46:36 +0200 |
| commit | aacc6afdb8cdeb2558e6942dcd65ca0079bec1ee (patch) | |
| tree | a59d7bdb862ddf0ffbad81ec917039d8071ada63 | |
| parent | bc38f25c021dc4314c77d50a608329a328b0d988 (diff) | |
patch 8.2.0736: some files not recognized as pamenvv8.2.0736
Problem: Some files not recognized as pamenv.
Solution: Add pam_inv.conf. (closes #6065)
| -rw-r--r-- | runtime/filetype.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6d26ea098d..7157f092b6 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1134,7 +1134,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/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 117b520723..c881fdedce 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -322,7 +322,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'], diff --git a/src/version.c b/src/version.c index 96ca8898ae..7fcef28487 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 736, +/**/ 735, /**/ 734, |