Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: benpjohnson/vimrc
base: 011def687d
...
head fork: benpjohnson/vimrc
compare: 4e0a909081
Checking mergeability… Don't worry, you can still create the pull request.
  • 10 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
6 .gitmodules
@@ -64,6 +64,12 @@
[submodule "bundle/snipmate"]
path = bundle/snipmate
url = git@github.com:benpjohnson/snipmate.vim.git
+[submodule "bundle/vim-extradite"]
+ path = bundle/vim-extradite
+ url = https://github.com/int3/vim-extradite.git
[submodule "bundle/syntastic"]
path = bundle/syntastic
url = https://github.com/scrooloose/syntastic.git
+[submodule "bundle/csv"]
+ path = bundle/csv
+ url = https://github.com/chrisbra/csv.vim.git
1  bundle/csv
@@ -0,0 +1 @@
+Subproject commit bc9e939d2a122e33c4a37065a11d28442a62e04f
1  bundle/vim-extradite
@@ -0,0 +1 @@
+Subproject commit 1906606b0e4d7d74764c1b0c1a3e24ed29338492
View
10 plugin-settings.vim
@@ -79,7 +79,12 @@ noremap <Leader>< :r /tmp/screen-exchange<CR>
fun! NoteAdd()
return "* " . strftime("%Y-%m-%d") . " "
endfun
+fun! EntryAdd()
+ return strftime("%Y-%m-%d %H:%M:%S") . " "
+endfun
+
map <Leader>n <Esc>ggO<C-r>=NoteAdd()<CR>
+map <Leader>N <Esc>ggO<C-r>=EntryAdd()<CR>
" Experiments with MozRepl
map <silent> <Leader>rr :silent !fr -e content -j 'location.reload()'<CR>
@@ -94,8 +99,9 @@ let g:pdv_cfg_Author = "Benjamin Johnson"
let g:pdv_cfg_Copyright = ""
let g:pdv_cfg_License = ""
-" Local history settings
-let g:vlh_repository_dir = $HOME . "/.vimlocalhistory"
+" Use debain ack version
+let g:ackprg="ack-grep -H --nocolor --nogroup --column"
" Syntastic_enable_signs
let g:syntastic_enable_signs=1
+let g:syntastic_phpcs_disable=1

No commit comments for this range

Something went wrong with that request. Please try again.