aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2020-05-15 10:36:32 -0400
committerGitHub <noreply@github.com>2020-05-15 10:36:32 -0400
commite2a33a6622193df383870903cd39a3080c890d4d (patch)
treed92783cac8745057428b5f0e27094acb60c49d53 /runtime
parentda6f38ab3cd87615e212b83ff9bbb9d585e4768e (diff)
parent076b0949d045d19decb2625c04128200ce8a987f (diff)
downloadrneovim-e2a33a6622193df383870903cd39a3080c890d4d.tar.gz
rneovim-e2a33a6622193df383870903cd39a3080c890d4d.tar.bz2
rneovim-e2a33a6622193df383870903cd39a3080c890d4d.zip
Merge pull request #12259 from janlazo/vim-8.1.1186
Diffstat (limited to 'runtime')
-rw-r--r--runtime/filetype.vim3
-rw-r--r--runtime/indent/testdir/runtest.vim1
2 files changed, 4 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index dc0bca2c60..0b5003dc44 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1129,6 +1129,9 @@ au BufNewFile,BufRead pf.conf setf pf
" Pam conf
au BufNewFile,BufRead */etc/pam.conf setf pamconf
+" Pam environment
+au BufNewFile,BufRead pam_env.conf,.pam_environment setf pamenv
+
" PApp
au BufNewFile,BufRead *.papp,*.pxml,*.pxsl setf papp
diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim
index 9502c42f3e..945c2753e9 100644
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -10,6 +10,7 @@ filetype indent on
syn on
set nowrapscan
set report=9999
+set modeline
au! SwapExists * call HandleSwapExists()
func HandleSwapExists()