4248c38099cc
Merge.
author | Steve Losh <steve@stevelosh.com> |
---|---|
date | Tue, 19 Oct 2010 17:08:12 -0400 |
parents | 2215cbbb954c (current diff) acbc504fc4e7 (diff) |
children | 519a89230533 f71dcc350ee4 |
branches/tags | (none) |
files |
Changes
--- a/.hgrc Tue Oct 19 17:07:56 2010 -0400 +++ b/.hgrc Tue Oct 19 17:08:12 2010 -0400 @@ -39,6 +39,7 @@ cbsl = ssh://hg@codebasehq.com/stevelosh/ stable = ssh://hg@bitbucket.org/stable/ dwd = ssh://hg@bitbucket.org/dwaiter/ +nyh = ssh://sjl@gotham.nyhacker.org/ [diff] git = True
--- a/bootstrap.sh Tue Oct 19 17:07:56 2010 -0400 +++ b/bootstrap.sh Tue Oct 19 17:08:12 2010 -0400 @@ -12,10 +12,6 @@ mkdir bin mkdir src -echo '#!/usr/bin/env python' > bin/batcharge.py -echo 'pass' >> bin/batcharge.py -chmod u+x bin/batcharge.py - hg clone 'http://selenic.com/repo/hg#stable' ~/lib/hg/hg-stable cd ~/lib/hg/hg-stable make local @@ -43,7 +39,7 @@ ln -s "$HOME/lib/dotfiles/.ackrc" "$HOME/.ackrc" ln -s "$HOME/lib/dotfiles/.gitconfig" "$HOME/.gitconfig" ln -s "$HOME/lib/dotfiles/.hgrc" "$HOME/.hgrc" -ln -s "$HOME/lib/dotfiles/vim/.vim" "$HOME/.vim" +ln -s "$HOME/lib/dotfiles/vim" "$HOME/.vim" ln -s "$HOME/lib/dotfiles/vim/.vimrc" "$HOME/.vimrc" ln -s "$HOME/lib/dotfiles/.screenrc" "$HOME/.screenrc"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/vim/plugin/hexHighlight.vim Tue Oct 19 17:08:12 2010 -0400 @@ -0,0 +1,42 @@ +"gvim plugin for highlighting hex codes to help with tweaking colors +"Last Change: 2010 Jan 21 +"Maintainer: Yuri Feldman <feldman.yuri1@gmail.com> +"License: WTFPL - Do What The Fuck You Want To Public License. +"Email me if you'd like. +let s:HexColored = 0 +let s:HexColors = [] + +map <Leader><F2> :call HexHighlight()<Return> +function! HexHighlight() + if has("gui_running") + if s:HexColored == 0 + let hexGroup = 4 + let lineNumber = 0 + while lineNumber <= line("$") + let currentLine = getline(lineNumber) + let hexLineMatch = 1 + while match(currentLine, '#\x\{6}', 0, hexLineMatch) != -1 + let hexMatch = matchstr(currentLine, '#\x\{6}', 0, hexLineMatch) + exe 'hi hexColor'.hexGroup.' guifg='.hexMatch.' guibg='.hexMatch + exe 'let m = matchadd("hexColor'.hexGroup.'", "'.hexMatch.'", 25, '.hexGroup.')' + let s:HexColors += ['hexColor'.hexGroup] + let hexGroup += 1 + let hexLineMatch += 1 + endwhile + let lineNumber += 1 + endwhile + unlet lineNumber hexGroup + let s:HexColored = 1 + echo "Highlighting hex colors..." + elseif s:HexColored == 1 + for hexColor in s:HexColors + exe 'highlight clear '.hexColor + endfor + call clearmatches() + let s:HexColored = 0 + echo "Unhighlighting hex colors..." + endif + else + echo "hexHighlight only works with a graphical version of vim" + endif +endfunction