vimperator: use C-c as a base for _all_ personal bindings

1 files changed, 67 insertions, 75 deletions

diff --git a/vimperatorrc b/vimperatorrc
index c87d2c3..22a5205 100644
--- a/vimperatorrc
+++ b/vimperatorrc
@@ -1,51 +1,45 @@
-" {{{ anrxc's vimperator init file with Emacs bindings
+" {{{ anrxc's vimperator configuration with Emacs bindings
 "
-" For a nice formatted list of keybindings check: 
+" Formatted list of keybindings:
 "   * http://sysphere.org/~anrxc/j/articles/vimperator/index.html
 
 " TODO
 "  * C-n and C-p in "INSERT (menu)" mode
-"      - see this feature request: http://vimperator.org/trac/ticket/235
-"  * C-? bindings wanted for: i (caret mode) and v (visual mode)
-"  * C-g is buggy in insert mode in Vimperator 2.0
-"      * completion brings system and FF to a crawl anyway so I will not use v2.0
-"      * C-g solved in Vimperator 2.1 and completion is fixed
+"      - feature request: http://vimperator.org/trac/ticket/235
 " }}}
 
 
 " {{{ Options
-"     - Most of the options already have good defaults
 "
 " User styles as colorschemes in Vimperator 2
-"   * ~/.vimperator/colors/clearlooks.vimp
 colorscheme clearlooks
 
-" Window title (Vimperator by default)
+" Window title
 set titlestring=Firefox
 
-" Editor, C-i invokes it in text fields (replaces "It's All Text")
+" Editor, C-i invokes it in text fields
 set editor=emacsclient
 
 " Command line and search patterns history
 set history=10000
 
-" Show the toolbar on startup (I keep all bars in one)
-"set go+=T
+" Show pattern matches as you type
+set incsearch
+
+" Hilight previous search pattern matches
+set hlsearch
+
+" Override ignorecase if pattern has uppercase chars
+set smartcase
 
 " Show the tab bar only if more then one tab is open
 set showtabline=0
 
-" Focus the content after a page has loaded
+" Focus content after a page has loaded
 set focuscontent
 
-" Show pattern matches as you type
-set incsearch
-
-" Override ignorecase if pattern has uppercase characters
-set smartcase
-
 " Show destination links in 1=status line, 2=command line
-set showstatuslinks=1
+set showstatuslinks=2
 
 " Show completions and use AwesomeBar (+search plugins)
 set complete=sl
@@ -54,20 +48,14 @@ set wildoptions=auto
 " Ex commands output in a new tab by default (prefs, addons...)
 set newtab=all
 
-" Hilight previous search pattern matches
-set hlsearch
-
-" Default search engine is ignored, plugins are used, place yubnub in there and do:
+" Internal default search engine is ignored, plugins are used
 set ds=yubnub
 " }}}
 
 
 " {{{ Key bindings
-"     - Emacs GTK key theme and FF already provide bindings for input fields
+"     - Emacs GTK key-theme and FF already provide bindings for input fields
 " 
-" Map leader
-let mapleader=","
-
 " M-x enters command mode
 noremap <A-x> :
 
@@ -91,6 +79,7 @@ noremap <C-b> <C-p>
 " Use C-a and C-e to jump to first/last tab
 "noremap <C-a> g0
 "noremap <C-e> g$
+"
 " Or use them to go to the absolute left/right of the document
 noremap <C-a> 0
 noremap <C-e> $
@@ -115,6 +104,7 @@ noremap <C-r> ?
 
 " Copy the current URL to the clipboard with M-w
 noremap <A-w> y
+"
 " Copy selected text to the clipboard with C-w 
 noremap <C-w> Y
 
@@ -124,16 +114,16 @@ noremap <C-y> P
 " Use current URL as a start for a new location with C-x C-v
 noremap <C-x><C-v> O
 
-" C-g as cancel (C-c is stop)
-"cmap <C-g> <C-c>
+" C-g as cancel (C-q is stop)
 cmap <C-g> <Esc>
 imap <C-g> <Esc>
 noremap <C-g> <Esc>
 
 " Avoid Find dialog when canceling a started command, C-x C-g
 noremap <C-x><C-g> <Esc>
+"
 " Avoid quit on C-q, and it's more suitable for Stop here
-noremap <C-q> <C-c>
+noremap <C-q> :stop<CR>
 
 " Kill the buffer with C-x k
 noremap <C-x>k d
@@ -148,18 +138,19 @@ noremap <C-x><C-c> ZZ
 noremap <C-x>b b
 noremap <C-x><C-b> B
 
-" C-x l as :open
-" C-x t as :tabopen
-noremap <C-x>l :o<SPACE>
+" Open a link in a new tab with C-x t
+" Open a link in the current tab with C-x l
 noremap <C-x>t :t<SPACE>
+noremap <C-x>l :o<SPACE>
 
-" Switch roles of f and F to have hints opened in new tabs by default
+" Open hints in new tab by default (switch roles of f and F)
 "noremap f F
 "noremap F f
 
-" Switch hints to letter "j" for right hand usage
+" Switch hints to letter "j", for right hand usage
 noremap j f
 noremap J F
+"
 " Extended hint mode with M-j
 "  ; - focus link, a - save, y - copy link, O - :open query, T - for :tabopen ...
 noremap <A-j> ;
@@ -171,9 +162,6 @@ noremap B H
 " Back with Backspace as well
 map <BS> H
 
-" Default C-o/C-i for older/newer position on the history jump list
-"remap if needed
-
 " Use C-h i to start help
 noremap <C-h>i :help<CR>
 
@@ -189,77 +177,81 @@ noremap <C-x>rm m
 " Jump to the mark in the current buffer with C-x r b
 noremap <C-x>rb '
 
-" C-v was pass-next command, re-map it so we can bind to default keys too
+" C-v was pass-next, remap to bind with default keys
 noremap <C-d> <C-v>
-
+"
 " C-x C-f starts the "Open File" dialog (C-x C-s is Save)
 map <C-x><C-f> <C-d><C-o>
 
 
-" I also use these, with no connection to Emacs bindings
+" {{{ Personal key bindings
 "
-" M-Up/Dn toggles the toolbar (I keep all bars in one)
+" M-Up/Dn toggles the toolbar
 map <A-Down> :set go+=T<CR>
 map <A-Up> :set go-=T<CR>
 
-" Sidebar selection with s, close a sidebar with S
+" Sidebar selection with s, close with S
 map s :sidebar<SPACE>
 map S :sbclose<CR>
 
 " Dialog selection with d
 map d :dialog<SPACE>
 
-" Bookmark this page with C-x a (dialog)
-map <C-x>a <C-d><C-d>
+" Add a bookmark with C-c a (dialog)
+map <C-c>a <C-d><C-d>
 
-" Bookmarks search and search by tag
-map <C-x>q :bmarks<SPACE>
-map <C-x>w :bmarks -tags=
+" Bookmarks search, and search by tag
+map <C-c>q :bmarks<SPACE>
+map <C-c>w :bmarks -tags=
 
-" View source with C-x g
-noremap <C-x>g gf
+" View source with C-c g
+map <C-c>g gf
+"
 " or in an external editor
-"noremap <C-x>g gF
+"map <C-c>g gF
 
 " Focus the address bar with C-l
 map <C-l> <C-d><C-l>
 
-" Open picture location with C-x p
-noremap <C-x>p ;i
+" Restart with C-c C-r
+map <C-c><C-r> :restart<CR>
 
-" Open context menu with C-x m
-noremap <C-x>m ;c
+" Open picture location with C-c p
+map <C-c>p ;i
 
-" Focus last used input field with C-x i
-noremap <C-x>i gi
+" Open context menu with C-c m
+map <C-c>m ;c
 
-" Open home directory with C-x f
-noremap <C-x>f ~
+" Focus last used input field with C-c i
+map <C-c>i gi
 
-" Go to home page with C-x h
-noremap <C-x>h gh
+" Open home directory with C-c f
+map <C-c>f ~
 
-" Go to parent directory with C-x u
-noremap <C-x>u gu
+" Go to home page with C-c h
+map <C-c>h gh
 
-" Go to the root of the website with C-x C-u
-noremap <C-x><C-u> gU
+" Go to parent directory with C-c u
+map <C-c>u gu
+
+" Go to the root of the website with C-c C-u
+map <C-c><C-u> gU
+" }}}
 " }}}
 
 
 " {{{ Plugins
 "
+" Buftabs
+map <C-c>b :set invbuftabs<CR>
+
 " Noscript
-noremap <silent> <Leader>s :noscript toggletemp<CR>
-noremap <silent> <Leader>S :noscript toggleperm<CR>
-noremap <silent> <Leader>p :noscript popup<CR>
-" }}}
+map <C-c>s :noscript toggletemp<CR>
+map <C-c>S :noscript popup<CR>
 
 " TinyURL
-:map <silent> <Leader>t :exe ":tinyurl "+getBrowser().contentWindow.location.href<CR>
-
-" Buftabs
-"set buftabs=0
+map <C-c>t :exe ":tinyurl "+getBrowser().contentWindow.location.href<CR>
+" }}}
 
 
 " {{{ Javascript functions