Runtime file updates.
diff --git a/runtime/ftplugin/fortran.vim b/runtime/ftplugin/fortran.vim
index 110dab3..7591edd 100644
--- a/runtime/ftplugin/fortran.vim
+++ b/runtime/ftplugin/fortran.vim
@@ -1,12 +1,12 @@
" Vim settings file
" Language: Fortran 2008 (and older: Fortran 2003, 95, 90, 77, 66)
-" Version: 0.48
-" Last Change: 2012 Apr. 18
-" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www.unb.ca/chem/ajit/>
+" Version: 0.49
+" Last Change: 2013 Oct. 01
+" Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
" Usage: Do :help fortran-plugin from Vim
" Credits:
-" Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, and Ben
-" Fritz.
+" Useful suggestions were made by Stefano Zacchiroli, Hendrik Merx, Ben
+" Fritz, and David Barnett.
" Only do these settings when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -64,8 +64,8 @@
" setlocal tw=73
else
setlocal comments=:!
- " Free format allows a textwidth of 132 for code but 80 is more usual
- setlocal tw=80
+ " Free format allows a textwidth of 132
+ setlocal tw=132
endif
" Set commentstring for foldmethod=marker
@@ -76,8 +76,8 @@
setlocal expandtab
endif
-" Set 'formatoptions' to break comment and text lines but allow long lines
-setlocal fo+=tcql
+" Set 'formatoptions' to break text lines
+setlocal fo+=t
setlocal include=^\\c#\\=\\s*include\\s\\+
setlocal suffixesadd+=.f08,.f03,.f95,.f90,.for,.f,.F,.f77,.ftn,.fpp
@@ -114,7 +114,7 @@
\ "All Files (*.*)\t*.*\n"
endif
-let b:undo_ftplugin = "setl fo< com< tw< cms< et< inc<"
+let b:undo_ftplugin = "setl fo< com< tw< cms< et< inc< sua<"
\ . "| unlet! b:match_ignorecase b:match_words b:browsefilter"
let &cpoptions=s:cposet
diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim
index 2b091a1..d823d68 100644
--- a/runtime/ftplugin/python.vim
+++ b/runtime/ftplugin/python.vim
@@ -1,7 +1,8 @@
" Vim filetype plugin file
" Language: python
" Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change: Wed, 21 Apr 2004 13:13:08 CEST
+" Last Change: 2013 Sep 25
+" Last Change By Johannes: Wed, 21 Apr 2004 13:13:08 CEST
if exists("b:did_ftplugin") | finish | endif
let b:did_ftplugin = 1
@@ -44,5 +45,21 @@
\ "All Files (*.*)\t*.*\n"
endif
+" As suggested by PEP8.
+setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
+
+" First time: try finding "pydoc".
+if !exists('g:pydoc_executable')
+ if executable('pydoc')
+ let g:pydoc_executable = 1
+ else
+ let g:pydoc_executable = 0
+ endif
+endif
+" If "pydoc" was found use it for keywordprg.
+if g:pydoc_executable
+ setlocal keywordprg=pydoc
+endif
+
let &cpo = s:keepcpo
unlet s:keepcpo