From 8f193284a9444359047d25ea1bcecc62509fd571 Mon Sep 17 00:00:00 2001 From: yan Date: Thu, 15 Dec 2011 23:24:22 -0800 Subject: [PATCH] Make Cmd-Space work for completion always. Display tab numbers --- README.md | 5 ++--- vim/plugin/settings/neocomplcache.vim | 4 ++-- vim/plugin/settings/skwp-keymap.vim | 2 +- vimrc | 3 ++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2fdf87e..be6ff48 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,6 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke * ,f - instantly Find definition of class (must have exuberant ctags installed) * ,z - jump back and forth between last two buffers * ,, or z,, - use EasyMotion - type that and then type one of the highlighted letters. - * Ctrl-j and Ctrl-k to move up and down roughly by functions * Ctrl-\ - Show current file in nerd tree * Ctrl-O - Old cursor position - this is a standard mapping but very useful, so included here @@ -148,11 +147,11 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke * ,s - Show buffers in LustyJuggler (use asdfjkl home row keys to then select buffer) * ,lf - lusty file finder * ,lr - lusty file finder from current folder + * ,lm ,lc ,ls - rails specific lusty juggler file finders (models, controllers, specs, etc) - just use the letter for what you want after ,l Rails * ,ru - Rails Unittest - synonym for :AV from rails.vim, opens up the corresponding test/spec to the file you're looking for, in a vertical split - * ,lm ,lc ,ls - rails specific lusty juggler file finders (models, controllers, specs, etc) - just use the letter for what you want after ,l * \ss to run specs, \ll to run a given spec on a line - using my vim-ruby-conque plugin (https://github.com/skwp/vim-ruby-conque) Search @@ -181,7 +180,7 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke * vv and ss - vertical and horizontal split windows by double tapping * H,L,I,M - to move left, right, up, down between windows * Cmd-H and Cmd-L - left an right on tabs - * Use Cmd-1..Cmd-0 to switch to a specific tab number (like iTerm) + * Use Cmd-1..Cmd-0 to switch to a specific tab number (like iTerm) - and tabs have been set up to show numbers Utility diff --git a/vim/plugin/settings/neocomplcache.vim b/vim/plugin/settings/neocomplcache.vim index 6f29a38..d2ace5b 100644 --- a/vim/plugin/settings/neocomplcache.vim +++ b/vim/plugin/settings/neocomplcache.vim @@ -12,8 +12,8 @@ let g:neocomplcache_max_list = 5 " words less than 3 letters long aren't worth completing let g:neocomplcache_auto_completion_start_length = 3 -" Choose completions using Apple-Space -inoremap pumvisible() ? "\" : "\" +" Map standard Ctrl-N completion to Cmd-Space +inoremap " This makes sure we use neocomplcache completefunc instead of " the one in rails.vim, otherwise this plugin will crap out diff --git a/vim/plugin/settings/skwp-keymap.vim b/vim/plugin/settings/skwp-keymap.vim index 2a4d17e..0807e14 100644 --- a/vim/plugin/settings/skwp-keymap.vim +++ b/vim/plugin/settings/skwp-keymap.vim @@ -9,7 +9,7 @@ nnoremap ,yw yiww " ,ow = 'overwrite word', replace a word with what's in the yank buffer " FIXME: will not properly repeat when you use a dot (tie into repeat.vim) -nnoremap ,ow viwp +nnoremap ,ow viwp "make Y consistent with C and D nnoremap Y y$ diff --git a/vimrc b/vimrc index 21d06a4..34baa53 100644 --- a/vimrc +++ b/vimrc @@ -101,7 +101,8 @@ if has("gui_running") colorscheme solarized set background=dark - set guitablabel=%M%t + " Show tab number (useful for Cmd-1, Cmd-2.. mapping) + set guitablabel=%N:\ %t\ %M set lines=60 set columns=190