634da3fd5f01
Merge.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Tue, 30 Oct 2012 10:31:31 -0400 |
| parents | e6128590d2a4 (diff) ea2c674ffea4 (current diff) |
| children | e3bd494ee399 |
| branches/tags | (none) |
| files | vim/vimrc |
Changes
--- a/.hgsubstate Sat Oct 27 14:27:36 2012 -0400 +++ b/.hgsubstate Tue Oct 30 10:31:31 2012 -0400 @@ -3,7 +3,7 @@ 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack -65adfb4b8907a83556b4d43234b115bacd958472 vim/bundle/badwolf +89b93b086f099050eb5c5c5121cb18cc01b61f3e vim/bundle/badwolf 8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary 3c6182371db8e8ede3789d21b52386569eda2208 vim/bundle/ctrlp @@ -20,7 +20,7 @@ 49ae47e66f51c92b0f467f9817d5d8745f627132 vim/bundle/python-mode 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt -949c1014e9378fe2654818dbcd936d93e8b6ba7d vim/bundle/slimv +b1591aa1c7057c163bf5d7dd552f044422667bc2 vim/bundle/slimv 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup 3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice
--- a/fish/config.fish Sat Oct 27 14:27:36 2012 -0400 +++ b/fish/config.fish Tue Oct 30 10:31:31 2012 -0400 @@ -103,6 +103,13 @@ set -g T_TASK_COUNT (count_t_tasks) end +function packfor + cp ~/Dropbox/tasks/pack-archive ~/Dropbox/tasks/pack.txt +end +function p + ~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=pack.txt $argv +end + # }}} # Bind Keys {{{
--- a/vim/vimrc Sat Oct 27 14:27:36 2012 -0400 +++ b/vim/vimrc Tue Oct 30 10:31:31 2012 -0400 @@ -262,8 +262,8 @@ " System clipboard interaction. Mostly from: " https://github.com/henrik/dotfiles/blob/master/vim/config/mappings.vim noremap <leader>y "*y -noremap <leader>p :set paste<CR>"*p<CR>:set nopaste<CR> -noremap <leader>P :set paste<CR>"*P<CR>:set nopaste<CR> +noremap <leader>p :silent! set paste<CR>"*p:set nopaste<CR> +noremap <leader>P :silent! set paste<CR>"*P:set nopaste<CR> vnoremap <leader>y "*ygv " I constantly hit "u" in visual mode when I mean to "y". Use "gu" for those rare occasions.