Permalink
Browse files

Merge branch 'master' of github.com:Thinkatomic/vimfiles

  • Loading branch information...
2 parents f455b19 + dfd58a0 commit 5794e5bbaec495f635876cc2da875fdfe46cfab4 @newellista newellista committed Apr 5, 2012
Showing with 28 additions and 0 deletions.
  1. +9 −0 .gitmodules
  2. +1 −0 .vim/bundle/vim-endwise
  3. +1 −0 .vim/bundle/vim-javascript
  4. +1 −0 .vim/bundle/vim-javascript-syntax
  5. +3 −0 .vim/snippets/javascript.snippets
  6. +13 −0 .vimrc
View
9 .gitmodules
@@ -16,3 +16,12 @@
[submodule ".vim/bundle/vim-colors-solarized"]
path = .vim/bundle/vim-colors-solarized
url = git://github.com/altercation/vim-colors-solarized.git
+[submodule ".vim/bundle/vim-endwise"]
+ path = .vim/bundle/vim-endwise
+ url = https://github.com/tpope/vim-endwise
+[submodule ".vim/bundle/vim-javascript-syntax"]
+ path = .vim/bundle/vim-javascript-syntax
+ url = git://github.com/jelera/vim-javascript-syntax.git
+[submodule ".vim/bundle/vim-javascript"]
+ path = .vim/bundle/vim-javascript
+ url = git://github.com/pangloss/vim-javascript.git
1 .vim/bundle/vim-endwise
@@ -0,0 +1 @@
+Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
1 .vim/bundle/vim-javascript
@@ -0,0 +1 @@
+Subproject commit a8ce721701fdd015695406f7df315f48bb447ebb
1 .vim/bundle/vim-javascript-syntax
@@ -0,0 +1 @@
+Subproject commit e713ddc1f7d9847cd8472864f8932f1ef4f0430a
View
3 .vim/snippets/javascript.snippets
@@ -0,0 +1,3 @@
+# Anonymous Function
+snippet fn
+ function(${1}) { ${2} }
View
13 .vimrc
@@ -100,7 +100,10 @@ set clipboard=unnamed
" Command-T Key Bindings
let g:CommandTCancelMap=['<ESC>','<C-c>']
+let g:CommandTAcceptSelectionSplitMap=['<C-CR>','<C-s>']
+" Mapping for unobtrusive editing
+map <Leader>w :noautocmd w<cr>
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" ARROW KEYS ARE UNACCEPTABLE
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -146,6 +149,8 @@ augroup filetype_html
" autocmd BufWrite,BufRead *.haml :normal gg=G
augroup END
+" Expand %% to current dir
+cnoremap %% <C-R>=expand('%:h').'/'<cr>
" Statusline
" [RO] full file name modified
@@ -157,3 +162,11 @@ set statusline+=\[%c\:%l\/%L\]
" Percentage complete
set statusline+=\ \ %P
+" The following is taken from https://www.destroyallsoftware.com/file-navigation-in-vim.html
+set winwidth=84
+" We have to have a winheight bigger than we want to set winminheight. But if
+" we set winheight to be huge before winminheight, the winminheight set will
+" fail.
+set winheight=5
+set winminheight=5
+set winheight=999

0 comments on commit 5794e5b

Please sign in to comment.