aboutsummaryrefslogtreecommitdiff
path: root/runtime/filetype.vim
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-10-24 13:17:41 +0200
committerGitHub <noreply@github.com>2016-10-24 13:17:41 +0200
commitfb503d73da49e26a3e44a07cd7c857d9fda9d035 (patch)
treed7f30d325c9649b4bfa9bf6d6823eddf882aeb25 /runtime/filetype.vim
parent43309d1993a9affc8d6b73fbd4721e6256c28712 (diff)
parentc91a0dca02fda46c4b4edbbdfab1a191b2e4fcbd (diff)
downloadrneovim-fb503d73da49e26a3e44a07cd7c857d9fda9d035.tar.gz
rneovim-fb503d73da49e26a3e44a07cd7c857d9fda9d035.tar.bz2
rneovim-fb503d73da49e26a3e44a07cd7c857d9fda9d035.zip
Merge #5483 from Shougo/vim-0648142
vim-patch 0648142, 91c4937, 06d2d38, 2685212, 269f595
Diffstat (limited to 'runtime/filetype.vim')
-rw-r--r--runtime/filetype.vim8
1 files changed, 3 insertions, 5 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c5a3577a62..bfb45a3720 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2015 Oct 13
+" Last Change: 2016 Jul 12
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -1617,11 +1617,9 @@ au BufNewFile,BufRead */etc/protocols setf protocols
" Pyrex
au BufNewFile,BufRead *.pyx,*.pxd setf pyrex
-" Python
-au BufNewFile,BufRead *.py,*.pyw setf python
-
+" Python, Python Shell Startup Files
" Quixote (Python-based web framework)
-au BufNewFile,BufRead *.ptl setf python
+au BufNewFile,BufRead *.py,*.pyw,.pythonstartup,.pythonrc,*.ptl setf python
" Radiance
au BufNewFile,BufRead *.rad,*.mat setf radiance