Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit 5794e5bbaec495f635876cc2da875fdfe46cfab4 2 parents f455b19 + dfd58a0
Steve Newell newellista authored
9 .gitmodules
@@ -16,3 +16,12 @@
16 16 [submodule ".vim/bundle/vim-colors-solarized"]
17 17 path = .vim/bundle/vim-colors-solarized
18 18 url = git://github.com/altercation/vim-colors-solarized.git
  19 +[submodule ".vim/bundle/vim-endwise"]
  20 + path = .vim/bundle/vim-endwise
  21 + url = https://github.com/tpope/vim-endwise
  22 +[submodule ".vim/bundle/vim-javascript-syntax"]
  23 + path = .vim/bundle/vim-javascript-syntax
  24 + url = git://github.com/jelera/vim-javascript-syntax.git
  25 +[submodule ".vim/bundle/vim-javascript"]
  26 + path = .vim/bundle/vim-javascript
  27 + url = git://github.com/pangloss/vim-javascript.git
1  .vim/bundle/vim-endwise
... ... @@ -0,0 +1 @@
  1 +Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
1  .vim/bundle/vim-javascript
... ... @@ -0,0 +1 @@
  1 +Subproject commit a8ce721701fdd015695406f7df315f48bb447ebb
1  .vim/bundle/vim-javascript-syntax
... ... @@ -0,0 +1 @@
  1 +Subproject commit e713ddc1f7d9847cd8472864f8932f1ef4f0430a
3  .vim/snippets/javascript.snippets
... ... @@ -0,0 +1,3 @@
  1 +# Anonymous Function
  2 +snippet fn
  3 + function(${1}) { ${2} }
13 .vimrc
@@ -100,7 +100,10 @@ set clipboard=unnamed
100 100
101 101 " Command-T Key Bindings
102 102 let g:CommandTCancelMap=['<ESC>','<C-c>']
  103 +let g:CommandTAcceptSelectionSplitMap=['<C-CR>','<C-s>']
103 104
  105 +" Mapping for unobtrusive editing
  106 +map <Leader>w :noautocmd w<cr>
104 107 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
105 108 " ARROW KEYS ARE UNACCEPTABLE
106 109 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -146,6 +149,8 @@ augroup filetype_html
146 149 " autocmd BufWrite,BufRead *.haml :normal gg=G
147 150 augroup END
148 151
  152 +" Expand %% to current dir
  153 +cnoremap %% <C-R>=expand('%:h').'/'<cr>
149 154
150 155 " Statusline
151 156 " [RO] full file name modified
@@ -157,3 +162,11 @@ set statusline+=\[%c\:%l\/%L\]
157 162 " Percentage complete
158 163 set statusline+=\ \ %P
159 164
  165 +" The following is taken from https://www.destroyallsoftware.com/file-navigation-in-vim.html
  166 +set winwidth=84
  167 +" We have to have a winheight bigger than we want to set winminheight. But if
  168 +" we set winheight to be huge before winminheight, the winminheight set will
  169 +" fail.
  170 +set winheight=5
  171 +set winminheight=5
  172 +set winheight=999

0 comments on commit 5794e5b

Please sign in to comment.
Something went wrong with that request. Please try again.