aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2014-05-15 11:49:35 -0400
committerTeddy Wing2014-05-15 11:49:35 -0400
commit88b7702816c1e5ffc09a333d0ee63378979fb9a8 (patch)
treeae5beb00bf8da5da8edbc5b533cb8614feb9dfe2
parent6f28a0a224e71accda4a5d1e11f85b104025fdc2 (diff)
downloaddotvim-88b7702816c1e5ffc09a333d0ee63378979fb9a8.tar.bz2
vimrc: turn on filetype plugin & add python ftplugin
* Ensure filetype plugin is on so that ftplugins get loaded * Add a filetype plugin for python with PEP8 indentation and cancel my custom mappings that preserve indentation on empty lines
-rw-r--r--ftplugin/python.vim13
-rw-r--r--vimrc9
2 files changed, 22 insertions, 0 deletions
diff --git a/ftplugin/python.vim b/ftplugin/python.vim
new file mode 100644
index 0000000..5b39a24
--- /dev/null
+++ b/ftplugin/python.vim
@@ -0,0 +1,13 @@
+" Python vim settings
+
+" Indentation
+setlocal expandtab
+setlocal tabstop=4
+setlocal softtabstop=4
+setlocal shiftwidth=4
+
+
+" Don't preserve indentation on empty lines
+inoremap <buffer> <CR> <CR>
+nnoremap <buffer> o o
+nnoremap <buffer> O O
diff --git a/vimrc b/vimrc
index 3da413e..3fd3274 100644
--- a/vimrc
+++ b/vimrc
@@ -127,6 +127,12 @@
" 2014.05.14:
" * Add commentary.vim definition for the "htmldjango" filetype
"
+" 2014.05.15:
+" * Turn on filetype plugin so that I can have filetype-specific
+" settings in their own files instead of having them clutter my vimrc
+" * Add a filetype plugin file for python, specifying PEP8 indentation
+" and ensuring indentation is not preserved on blank lines.
+"
" Pathogen
@@ -178,6 +184,9 @@ set backupdir=~/.vim/backup/backup//
set directory=~/.vim/backup/swap//
set undodir=~/.vim/backup/undo//
+" Enable filetype-specific settings
+filetype plugin on
+
set laststatus=2 " Always show the status line
" Statusline