Merge branch 'master' of tardis:/dotfiles

diff --git a/Xresources b/Xresources
index 17dff2fa9a04c8f7f7c4a0aef797981add1ca0ff..d309ca8b0f0ccf3e314d946ddd5a11cd531bc6cf 100644 (file)
--- a/Xresources
+++ b/Xresources
@@ -23,13 +23,13 @@ URxvt.iso14755_52:  false
 ! {{{1 Perl extensions
 URxvt.perl-ext-common:  default,clipboard,url-select,keyboard-select
 ! {{{2 url-select
-URxvt.keysym.1-u:           perl:url-select:select_next
+URxvt.keysym.C-F:           perl:url-select:select_next
 URxvt.url-select.button:    1
 URxvt.url-select.launcher:  mimeo
 URxvt.url-select.underline: true
 ! {{{2 keyboard-select
-URxvt.keysym.1-Escape: perl:keyboard-select:activate
-URxvt.keysym.1-s:      perl:keyboard-select:search
+URxvt.keysym.C-S-space:  perl:keyboard-select:activate
+URxvt.keysym.C-question: perl:keyboard-select:search
 ! {{{2 clipboard
 URxvt.keysym.C-C:   perl:clipboard:copy
 URxvt.keysym.C-V:   perl:clipboard:paste

diff --git a/vim/vimrc b/vim/vimrc
index e5570019972dc98dfa97d3ebaf0450604b17c1d2..fcc4ff9c8a819a870899d60e87e25870a5c57404 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -330,7 +330,7 @@ cnoremap <C-H>   <Left>
 cnoremap <C-L>   <Right>
 
 " close all folds open fold in cursor
-nnoremap zx zMzxzz15<C-e>
+nnoremap zx zMzxzt
 
 " edit vimrc in new tab
 nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>