--- a/.hgsubstate Tue Mar 27 11:38:35 2012 -0400
+++ b/.hgsubstate Wed Mar 28 10:18:06 2012 -0400
@@ -5,7 +5,7 @@
7d5b26907ce4e4d6de7ddf033fee82930733718c vim/bundle/badwolf
c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
-24e9b492fed51b1390b0f7984a047cdef776db7d vim/bundle/fugitive
+4f7af188fec24330e7dff99c8758588ae9780347 vim/bundle/fugitive
8078f3e3ed0f8a954d83ab35f238881e9fce479a vim/bundle/gundo
9b71f09cb0665560ef23b0c5a7d158b572fb8118 vim/bundle/html5
78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/dotjs/github.com.js Wed Mar 28 10:18:06 2012 -0400
@@ -0,0 +1,40 @@
+$(function() {
+ $('.site').prepend('<button id="toggle-merges-button">Review</button>');
+ $('#toggle-merges-button').css('position', 'absolute').css('top', '10px').css('left', '10px');
+
+ $('#toggle-merges-button').toggle(function() {
+ $('li.commit').each(function() {
+ var t = $(this).find('a.message').text().substring(0, 5);
+ if (t === 'Merge' || t === 'merge') {
+ $(this).hide();
+ return;
+ }
+ t = $(this).find('a.message').text().substring(0, 24);
+ if (t === 'Updated integration repo' || t === 'updated integration repo') {
+ $(this).hide();
+ return;
+ }
+ t = $(this).find('a.message').text().substring(0, 23);
+ if (t === 'Update integration repo' || t === 'update integration repo') {
+ $(this).hide();
+ return;
+ }
+ t = $(this).find('a.message').text().substring(0, 26);
+ if (t === 'Update unisubs-integration' || t === 'update unisubs-integration') {
+ $(this).hide();
+ return;
+ }
+ t = $(this).find('a.message').text().substring(0, 65);
+ if (t === 'Updated transiflex translations -- through update_translations.sh') {
+ $(this).hide();
+ return;
+ }
+ if ($(this).find('span.author-name').text() === 'sjl') {
+ $(this).hide();
+ return;
+ }
+ });
+ }, function() {
+ $('li.commit').show();
+ });
+});
--- a/vim/.vimrc Tue Mar 27 11:38:35 2012 -0400
+++ b/vim/.vimrc Wed Mar 28 10:18:06 2012 -0400
@@ -253,8 +253,8 @@
" Highlight Group(s)
nnoremap <F8> :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<'
-\ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
-\ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
+ \ . synIDattr(synID(line("."),col("."),0),"name") . "> lo<"
+ \ . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
" Clean trailing whitespace
nnoremap <leader>w mz:%s/\s\+$//<cr>:let @/=''<cr>`z
@@ -455,6 +455,7 @@
noremap <C-j> <C-w>j
noremap <C-k> <C-w>k
noremap <C-l> <C-w>l
+
noremap <leader>v <C-w>v
" }}}