95ec2bfa74b6
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Thu, 04 Nov 2010 17:07:48 -0400 |
parents | d3e0c0c7ff37 (diff) f5178198080a (current diff) |
children | d00614f860c8 |
branches/tags | (none) |
files | vim/.vimrc |
Changes
--- a/.hgrc Tue Nov 02 18:23:07 2010 -0400 +++ b/.hgrc Thu Nov 04 17:07:48 2010 -0400 @@ -138,6 +138,8 @@ echo '*.swp' >> .hgignore && \ echo '*.swo' >> .hgignore && \ echo '*.un~' >> .hgignore && \ + echo '.ropeproject' >> .hgignore && \ + echo 'tags' >> .hgignore && \ echo "[paths]\n" >> .hg/hgrc # Empty the current MQ patch.
--- a/mutt/offlineimapsync.sh Tue Nov 02 18:23:07 2010 -0400 +++ b/mutt/offlineimapsync.sh Thu Nov 04 17:07:48 2010 -0400 @@ -1,8 +1,7 @@ #!/bin/sh -PID=`/usr/local/bin/pgrep offlineimap` - -[[ -n "$PID" ]] && kill $PID +PID=`cat ~/.offlineimap/pid` +ps aux | grep "[ ]$PID" && kill $PID /usr/local/bin/offlineimap -o -u Noninteractive.Quiet &>/dev/null &
--- a/mutt/offlineimapsyncquick.sh Tue Nov 02 18:23:07 2010 -0400 +++ b/mutt/offlineimapsyncquick.sh Thu Nov 04 17:07:48 2010 -0400 @@ -1,8 +1,7 @@ #!/bin/sh -PID=`/usr/local/bin/pgrep offlineimap` - -[[ -n "$PID" ]] && kill $PID +PID=`cat ~/.offlineimap/pid` +ps aux | grep "[ ]$PID" && kill $PID /usr/local/bin/offlineimap -q -o -u Noninteractive.Quiet &>/dev/null &
--- a/vim/.vimrc Tue Nov 02 18:23:07 2010 -0400 +++ b/vim/.vimrc Thu Nov 04 17:07:48 2010 -0400 @@ -32,6 +32,9 @@ set undofile set undoreload=10000 +" Status line +set statusline=%F%m%r%h%w%=(%{&ff}/%Y)\ (line\ %l\/%L,\ col\ %c) + " Backups set backupdir=~/.vim/tmp/backup// " backups set directory=~/.vim/tmp/swap// " swap files