# HG changeset patch # User Steve Losh # Date 1349885145 14400 # Node ID 6f8a1927f3aae40a2a97d84753f4e5dc8636de59 # Parent 8724f02b290871ee6d1f2080a68874d3edad9fc0# Parent e484a4d62a7b09d8aea60614654ebfb925a1b955 Merge. diff -r 8724f02b2908 -r 6f8a1927f3aa .hgsub --- a/.hgsub Wed Oct 10 12:05:29 2012 -0400 +++ b/.hgsub Wed Oct 10 12:05:45 2012 -0400 @@ -7,7 +7,6 @@ vim/bundle/clam = [hg]https://bitbucket.org/sjl/clam.vim/ vim/bundle/commentary = [git]git://github.com/tpope/vim-commentary.git vim/bundle/ctrlp = [git]git://github.com/kien/ctrlp.vim.git -vim/bundle/easymotion = [git]git://github.com/Lokaltog/vim-easymotion.git vim/bundle/fugitive = [git]git://github.com/tpope/vim-fugitive.git vim/bundle/gundo = [hg]https://bitbucket.org/sjl/gundo.vim/ vim/bundle/html5 = [git]git://github.com/othree/html5.vim.git diff -r 8724f02b2908 -r 6f8a1927f3aa .hgsubstate --- a/.hgsubstate Wed Oct 10 12:05:29 2012 -0400 +++ b/.hgsubstate Wed Oct 10 12:05:45 2012 -0400 @@ -7,7 +7,6 @@ 8533fffd9fbb690dfc8e334f91a10c72e35a6dce vim/bundle/clam dc349bb7d30f713d770fc1fa0fe209e6aab82dc8 vim/bundle/commentary 3c6182371db8e8ede3789d21b52386569eda2208 vim/bundle/ctrlp -667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion cff78c3ab4605d490e6be8d8af02f1e7efd25c95 vim/bundle/fugitive 8c570a493d260890242cbdc5a22d8500dc4604cb vim/bundle/gundo 34b407d2344a3c2a94b56e9d443e18e01e8544d9 vim/bundle/html5 diff -r 8724f02b2908 -r 6f8a1927f3aa bash_profile --- a/bash_profile Wed Oct 10 12:05:29 2012 -0400 +++ b/bash_profile Wed Oct 10 12:05:45 2012 -0400 @@ -6,12 +6,28 @@ # This file contains aliases and functions that duplicate some fish # functionality, because Vim will use bash as its external command shell. -function a() { - if [ -f '.agignorevcs' ]; then - ag -U $* +AG_BIN="`which ag`" +function ag() { + if test -f '.agignore' && grep -q 'pragma: skipvcs' '.agignore'; then + $AG_BIN --search-files -U $* else - ag $* + $AG_BIN --search-files $* fi } export PATH=~/bin:~/lib/dotfiles/bin:/usr/local/share/python:$PATH + +alias h='hg' +alias g='git' +alias pbc='pbcopy' +alias pbp='pbpaste' +alias pbpb='pbp | pb' +alias vu='vagrant up' +alias vs='vagrant suspend' +alias o='open' +alias oo='open .' +alias t='~/lib/t/t.py --task-dir="~/Dropbox/tasks" --list=tasks.txt' + +function psg() { + ps auxww | grep --color=always $* | grep -v grep | collapse | cuts -f 2,11- +} diff -r 8724f02b2908 -r 6f8a1927f3aa bin/bootstrap.sh --- a/bin/bootstrap.sh Wed Oct 10 12:05:29 2012 -0400 +++ b/bin/bootstrap.sh Wed Oct 10 12:05:45 2012 -0400 @@ -41,8 +41,9 @@ ensure_link "lib/dotfiles/ffignore" ".ffignore" ensure_link "lib/dotfiles/ctags" ".ctags" ensure_link "lib/dotfiles/grc" ".grc" -ensure_link "lib/dotfiles/fish/config.fish" ".config/fish/config.fish" ensure_link "lib/dotfiles/mutt/notmuch-config" ".notmuch-config" ensure_link "lib/dotfiles/bash_profile" ".bash_profile" +ensure_link "lib/dotfiles/inputrc" ".inputrc" +ensure_link "lib/dotfiles/fish/config.fish" ".config/fish/config.fish" echo completed diff -r 8724f02b2908 -r 6f8a1927f3aa fish/config.fish --- a/fish/config.fish Wed Oct 10 12:05:29 2012 -0400 +++ b/fish/config.fish Wed Oct 10 12:05:45 2012 -0400 @@ -24,7 +24,6 @@ alias et 'vim ~/.tmux.conf' alias eg 'vim ~/.gitconfig' - alias spotlight-off 'sudo mdutil -a -i off ; and sudo mv /System/Library/CoreServices/Search.bundle/ /System/Library/CoreServices/SearchOff.bundle/ ; and killall SystemUIServer' alias spotlight-on 'sudo mdutil -a -i on ; and sudo mv /System/Library/CoreServices/SearchOff.bundle/ /System/Library/CoreServices/Search.bundle/ ; and killall SystemUIServer' alias spotlight-wat 'sudo fs_usage -w -f filesys mdworker | grep "open"' @@ -67,11 +66,34 @@ VBoxManage controlvm $argv poweroff end -function a -d "Run Ag with appropriate options." - if test -f '.agignorevcs' - ag -U $argv +set AG_BIN (which ag) +function actual_ag + # Fuck you fish this is fucking ridiculous. Let me use $AG_BIN as + # a command. Or at least give me a way to do it like run $AG_BIN args or + # something jesus. + if test $AG_BIN = '/usr/local/bin/ag' + /usr/local/bin/ag $argv else - ag $argv + if test $AG_BIN = '/usr/bin/ag' + /usr/bin/ag $argv + else + echo "Fish is a dick, sorry." + end + end +end +function ag -d "Run Ag with appropriate options." + if test -f '.agignore' + # Extra if statement because I can't figure out how to && things in + # a fish conditional and the documentation does not see fit to explain + # that little tidbit and can we please get a shell without complete + # bullshit as a scripting language syntax? + if grep -q 'pragma: skipvcs' '.agignore' + actual_ag --search-files -U $argv + else + actual_ag --search-files $argv + end + else + actual_ag --search-files $argv end end @@ -93,7 +115,7 @@ function prepend_to_path -d "Prepend the given dir to PATH if it exists and is not already in it" if test -d $argv[1] if not contains $argv[1] $PATH - set -g PATH "$argv[1]" $PATH + set -gx PATH "$argv[1]" $PATH end end end @@ -258,7 +280,10 @@ end # }}} +# Fortune {{{ if status --is-interactive command fortune -s | cowsay -n | lolcat end + +# }}} diff -r 8724f02b2908 -r 6f8a1927f3aa gitconfig --- a/gitconfig Wed Oct 10 12:05:29 2012 -0400 +++ b/gitconfig Wed Oct 10 12:05:45 2012 -0400 @@ -25,9 +25,10 @@ pull = pull --ff-only up = merge --ff-only - merge = merge --no-ff join = merge --no-ff + discard-merge = reset --hard HEAD + ci = commit cm = commit -m diff -r 8724f02b2908 -r 6f8a1927f3aa inputrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/inputrc Wed Oct 10 12:05:45 2012 -0400 @@ -0,0 +1,2 @@ +\e[O: '' +\e[I: '' diff -r 8724f02b2908 -r 6f8a1927f3aa keyremap4macbook/cadet.py --- a/keyremap4macbook/cadet.py Wed Oct 10 12:05:29 2012 -0400 +++ b/keyremap4macbook/cadet.py Wed Oct 10 12:05:45 2012 -0400 @@ -39,7 +39,7 @@ ('n', u'' , u'ℕ', u'', u''), ('o', u'∨', u'', u'', u''), ('r', u'√', u'ℝ', u'', u''), - ('t', u'⊢', u'⊥', u'', u''), + # ('t', u'⊢', u'⊥', u'', u''), ('u', u'∪', u'', u'', u''), ('x', u'⊻', u'', u'', u''), ('z', u'' , u'ℤ', u'', u''), diff -r 8724f02b2908 -r 6f8a1927f3aa keyremap4macbook/private.xml --- a/keyremap4macbook/private.xml Wed Oct 10 12:05:29 2012 -0400 +++ b/keyremap4macbook/private.xml Wed Oct 10 12:05:45 2012 -0400 @@ -4,10 +4,73 @@ Space Cadet Mode This mode emulates a few of the features of the Space Cadet keyboard. + It also adds a few other helpful mappings. + It requires the Unicode Hex Input keyboard layout for the Greek and Math layers. + Force yourself to use the correct shift keys. + space_cadet.force_correct_shifts + + --KeyToKey-- KeyCode::Q, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::W, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::E, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::R, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::T, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::A, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::S, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::D, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::F, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::G, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::Z, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::X, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::C, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + --KeyToKey-- KeyCode::V, ModifierFlag::SHIFT_L, KeyCode::VK_NONE + + --KeyToKey-- KeyCode::Y, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::U, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::I, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::O, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::P, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::H, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::J, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::K, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::L, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::SEMICOLON, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::N, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::M, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::COMMA, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::DOT, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + --KeyToKey-- KeyCode::QUOTE, ModifierFlag::SHIFT_R, KeyCode::VK_NONE + + + Shifts to Parentheses + Shifts, when pressed alone, type parentheses. + When used with other keys they're normal shifts. + + space_cadet.shifts_to_parens + + + --KeyOverlaidModifier-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_R | ModifierFlag::NONE, KeyCode::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L + --KeyOverlaidModifier-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_L | ModifierFlag::NONE, KeyCode::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_R + + + --KeyToKey-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L + --KeyToKey-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L, KeyCode::KEY_0, ModifierFlag::SHIFT_L + + + --KeyToKey-- KeyCode::SPACE, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::SPACE + + Remap Left Control to Hyper OS X doesn't have a Hyper. This maps Left Control to Control + Shift + Option + Command. + You can use this key in your own custom keyboard shortcuts you create in apps. space_cadet.left_control_to_hyper @@ -20,6 +83,42 @@ + Restore [Shift-]Opt-(Left/Right) + The Unicode Hex Input keyboard layout disables these keys for some reason. + + space_cadet.fix_opt_arrows + + + --KeyToKey-- + KeyCode::CURSOR_LEFT, VK_OPTION | VK_SHIFT, + + KeyCode::B, + ModifierFlag::OPTION_L | ModifierFlag::SHIFT_L | ModifierFlag::CONTROL_L + + + --KeyToKey-- + KeyCode::CURSOR_LEFT, VK_OPTION, + + KeyCode::B, + ModifierFlag::OPTION_L | ModifierFlag::CONTROL_L + + + --KeyToKey-- + KeyCode::CURSOR_RIGHT, VK_OPTION | VK_SHIFT, + + KeyCode::F, + ModifierFlag::OPTION_L | ModifierFlag::SHIFT_L | ModifierFlag::CONTROL_L + + + --KeyToKey-- + KeyCode::CURSOR_RIGHT, VK_OPTION, + + KeyCode::F, + ModifierFlag::OPTION_L | ModifierFlag::CONTROL_L + + + + Math Layer Right Control key activates the Math key layer. @@ -164,26 +263,6 @@ --KeyToKey-- - KeyCode::T, ModifierFlag::EXTRA3 | VK_SHIFT, - KeyCode::KEY_2, ModifierFlag::OPTION_L, - KeyCode::KEY_2, ModifierFlag::OPTION_L, - KeyCode::A, ModifierFlag::OPTION_L, - KeyCode::KEY_5, ModifierFlag::OPTION_L, - - - - - --KeyToKey-- - KeyCode::T, ModifierFlag::EXTRA3, - KeyCode::KEY_2, ModifierFlag::OPTION_L, - KeyCode::KEY_2, ModifierFlag::OPTION_L, - KeyCode::A, ModifierFlag::OPTION_L, - KeyCode::KEY_2, ModifierFlag::OPTION_L, - - - - - --KeyToKey-- KeyCode::U, ModifierFlag::EXTRA3, KeyCode::KEY_2, ModifierFlag::OPTION_L, KeyCode::KEY_2, ModifierFlag::OPTION_L, @@ -1037,81 +1116,5 @@ - - - - sjl Swap parens and brackets - private.swap_parens_and_brackets - --KeyToKey-- KeyCode::BRACKET_LEFT, ModifierFlag::NONE, KeyCode::KEY_9, ModifierFlag::SHIFT_R - --KeyToKey-- KeyCode::BRACKET_RIGHT, ModifierFlag::NONE, KeyCode::KEY_0, ModifierFlag::SHIFT_R - --KeyToKey-- KeyCode::KEY_9, ModifierFlag::SHIFT_L, KeyCode::BRACKET_LEFT - --KeyToKey-- KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::BRACKET_RIGHT - - - - - - sjl Shifts to Parentheses - Shifts, when pressed alone, type parentheses. When used with other keys they're normal shifts. - - private.shifts_to_parens - - - --KeyOverlaidModifier-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_R | ModifierFlag::NONE, KeyCode::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L - --KeyOverlaidModifier-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_L | ModifierFlag::NONE, KeyCode::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_R - - - --KeyToKey-- KeyCode::SHIFT_L, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L - --KeyToKey-- KeyCode::SHIFT_R, ModifierFlag::SHIFT_L, KeyCode::KEY_9, ModifierFlag::SHIFT_L, KeyCode::KEY_0, ModifierFlag::SHIFT_L - - - --KeyToKey-- KeyCode::SPACE, ModifierFlag::SHIFT_R, KeyCode::KEY_0, ModifierFlag::SHIFT_L, KeyCode::SPACE - - - - - - sjl Use the correct goddamned shift keys. - private.fucking_shift_keys_how_do_they_work - - --KeyToKey-- KeyCode::Q, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::W, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::E, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::R, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::T, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::A, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::S, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::D, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::F, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::G, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::Z, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::X, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::C, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - --KeyToKey-- KeyCode::V, ModifierFlag::SHIFT_L, KeyCode::VK_NONE - - --KeyToKey-- KeyCode::Y, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::U, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::I, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::O, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::P, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::H, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::J, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::K, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::L, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::SEMICOLON, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::N, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::M, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::COMMA, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::DOT, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - --KeyToKey-- KeyCode::QUOTE, ModifierFlag::SHIFT_R, KeyCode::VK_NONE - - diff -r 8724f02b2908 -r 6f8a1927f3aa moom/com.manytricks.Moom.plist Binary file moom/com.manytricks.Moom.plist has changed diff -r 8724f02b2908 -r 6f8a1927f3aa mutt/muttrc --- a/mutt/muttrc Wed Oct 10 12:05:29 2012 -0400 +++ b/mutt/muttrc Wed Oct 10 12:05:45 2012 -0400 @@ -105,6 +105,7 @@ ignore * # ignore all headers unignore from: to: cc: date: subject: # show only these +unhdr_order * hdr_order from: to: cc: date: subject: # and in this order # }}} diff -r 8724f02b2908 -r 6f8a1927f3aa mutt/offlineimap.py --- a/mutt/offlineimap.py Wed Oct 10 12:05:29 2012 -0400 +++ b/mutt/offlineimap.py Wed Oct 10 12:05:45 2012 -0400 @@ -6,9 +6,9 @@ 'command': 'find-internet-password', 'account': account, 'server': server, - 'keychain': '/Users/sjl/Library/Keychains/login.keychain', + 'keychain': '/Users/`whoami`/Library/Keychains/login.keychain', } - command = "sudo -u sjl %(security)s -v %(command)s -g -a %(account)s -s %(server)s %(keychain)s" % params + command = "sudo -u `whoami` %(security)s -v %(command)s -g -a %(account)s -s %(server)s %(keychain)s" % params output = subprocess.check_output(command, shell=True, stderr=subprocess.STDOUT) outtext = [l for l in output.splitlines() if l.startswith('password: ')][0] diff -r 8724f02b2908 -r 6f8a1927f3aa vim/vimrc --- a/vim/vimrc Wed Oct 10 12:05:29 2012 -0400 +++ b/vim/vimrc Wed Oct 10 12:05:45 2012 -0400 @@ -162,11 +162,23 @@ " }}} " Backups {{{ +set backup " enable backups +set noswapfile " It's 2012, Vim. + set undodir=~/.vim/tmp/undo// " undo files set backupdir=~/.vim/tmp/backup// " backups set directory=~/.vim/tmp/swap// " swap files -set backup " enable backups -set noswapfile " It's 2012, Vim. + +" Make those folders automatically if they don't already exist. +if !isdirectory(expand(&undodir)) + call mkdir(expand(&undodir), "p") +endif +if !isdirectory(expand(&backupdir)) + call mkdir(expand(&backupdir), "p") +endif +if !isdirectory(expand(&directory)) + call mkdir(expand(&directory), "p") +endif " }}} " Leader {{{ @@ -466,12 +478,6 @@ " something similar: move to last change nnoremap gI `. -" Open a Quickfix window for the last search. -nnoremap ? :execute 'vimgrep /'.@/.'/g %':copen - -" Ack for the last search. -nnoremap / :execute "Ack! '" . substitute(substitute(substitute(@/, "\\\\<", "\\\\b", ""), "\\\\>", "\\\\b", ""), "\\\\v", "", "") . "'" - " Fix linewise visual selection of various text objects nnoremap VV V nnoremap Vit vitVkoj @@ -501,7 +507,6 @@ " }}} " Highlight word {{{ -nnoremap hh :execute 'match InterestingWord1 /\<\>/' nnoremap h1 :execute 'match InterestingWord1 /\<\>/' nnoremap h2 :execute '2match InterestingWord2 /\<\>/' nnoremap h3 :execute '3match InterestingWord3 /\<\>/' @@ -982,7 +987,7 @@ " Ack {{{ nnoremap a :Ack! -let g:ackprg = 'a --nogroup --nocolor --column' +let g:ackprg = 'ag --nogroup --nocolor --column' " }}} " Autoclose {{{ @@ -1054,22 +1059,6 @@ nnoremap . :CtrlPTag " }}} -" Easymotion {{{ - -let g:EasyMotion_do_mapping = 0 - -nnoremap f :call EasyMotion#F(0, 0) -onoremap f :call EasyMotion#F(0, 0) -vnoremap f :call EasyMotion#F(1, 0) - -nnoremap F :call EasyMotion#F(0, 1) -onoremap F :call EasyMotion#F(0, 1) -vnoremap F :call EasyMotion#F(1, 1) - -onoremap t :call EasyMotion#T(0, 0) -onoremap T :call EasyMotion#T(0, 1) - -" }}} " Fugitive {{{ nnoremap gd :Gdiff @@ -1223,7 +1212,7 @@ unlet w:is_scratch_window exec "q" else - exec "normal! :Sscratch\\J:resize 13\" + exec "normal! :Sscratch\\L" let w:is_scratch_window = 1 endif endfunction