73eda22f3125
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Wed, 17 Jul 2013 14:27:41 -0400 |
parents | 7ae059508515 (diff) f54eaeb2a58c (current diff) |
children | ea3fd4a6795a |
branches/tags | (none) |
files | fish/config.fish vim/vimrc |
Changes
--- a/.hgignore Mon Jul 15 18:53:57 2013 -0400 +++ b/.hgignore Wed Jul 17 14:27:41 2013 -0400 @@ -5,6 +5,7 @@ .netrwhist *.swp *.swo +*.orig tags config/bcvi *.un~
--- a/.hgsubstate Mon Jul 15 18:53:57 2013 -0400 +++ b/.hgsubstate Wed Jul 17 14:27:41 2013 -0400 @@ -9,7 +9,7 @@ dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary c1646e3c28d75bcc834af4836f4c6e12296ba891 vim/bundle/ctrlp ffbd5eb50c9daf67657b87fd767d1801ac9a15a7 vim/bundle/dispatch -4f6b8e52376dc9973ca0478b750578b681681b55 vim/bundle/fireplace +b96ccf7441ada22d764af8223b61f18896d82dc9 vim/bundle/fireplace cff78c3ab4605d490e6be8d8af02f1e7efd25c95 vim/bundle/fugitive eb9fc8676b8959c3c2c95bf6b6e8f0f44317c5c0 vim/bundle/gundo 34b407d2344a3c2a94b56e9d443e18e01e8544d9 vim/bundle/html5
--- a/fish/config.fish Mon Jul 15 18:53:57 2013 -0400 +++ b/fish/config.fish Wed Jul 17 14:27:41 2013 -0400 @@ -26,6 +26,18 @@ function sjoin -d "Join input lines into a single line with spaces"; tr '\n' ' '; end +function lstrip -d "Strip whitespace from the left of each line" + sed -e 's/^[ \t]*//' +end + +function rstrip -d "Strip whitespace from the right of each line" + sed -e 's/[ \t]*$//' +end + +function lrstrip -d "Strip whitespace from both ends of each line" + lstrip | rstrip +end + function pj python -m json.tool | pygmentize -l json end @@ -209,6 +221,7 @@ set -g -x DRIP_SHUTDOWN 30 set -g -x MAVEN_OPTS "-Xmx512M -XX:MaxPermSize=512M" +set -g -x _JAVA_OPTIONS "-Djava.awt.headless=true" # }}} # Python variables {{{
--- a/vim/vimrc Mon Jul 15 18:53:57 2013 -0400 +++ b/vim/vimrc Wed Jul 17 14:27:41 2013 -0400 @@ -888,6 +888,9 @@ au Filetype markdown nnoremap <buffer> <localleader>1 yypVr=:redraw<cr> au Filetype markdown nnoremap <buffer> <localleader>2 yypVr-:redraw<cr> au Filetype markdown nnoremap <buffer> <localleader>3 mzI###<space>`zllll <ESC> + + au Filetype markdown nnoremap <buffer> <localleader>p VV:'<,'>!python -m json.tool<cr> + au Filetype markdown vnoremap <buffer> <localleader>p :!python -m json.tool<cr> augroup END " }}}