Merge branch 'master' of urbainvaes.com:public/dotfiles

6 files changed, 3 insertions, 3 deletions

diff --git a/vifm/.vifm/.gitignore b/vifm/.config/vifm/.gitignore
index 8c6b1ef..8c6b1ef 100644
--- a/vifm/.vifm/.gitignore
+++ b/vifm/.config/vifm/.gitignore
diff --git a/vifm/.vifm/colorschemes b/vifm/.config/vifm/colorschemes
index 006bb44..006bb44 100644
--- a/vifm/.vifm/colorschemes
+++ b/vifm/.config/vifm/colorschemes
diff --git a/vifm/.vifm/scripts/README b/vifm/.config/vifm/scripts/README
index 8165c2f..8165c2f 100644
--- a/vifm/.vifm/scripts/README
+++ b/vifm/.config/vifm/scripts/README
diff --git a/vifm/.vifm/vifm-help.txt b/vifm/.config/vifm/vifm-help.txt
index 2b6bbba..2b6bbba 100644
--- a/vifm/.vifm/vifm-help.txt
+++ b/vifm/.config/vifm/vifm-help.txt
diff --git a/vifm/.vifm/vifmrc b/vifm/.config/vifm/vifmrc
index f4ff8ae..22486ca 100644
--- a/vifm/.vifm/vifmrc
+++ b/vifm/.config/vifm/vifmrc
@@ -30,6 +30,9 @@ nnoremap ,r :%rename<cr>
 nnoremap ,t :!urxvt &<cr>
 nnoremap ,l :!less %f<cr>
 
+" To disable automatic tagging of search results
+nnoremap coh :set hlsearch!<cr>
+
 " Colorscheme
 source /usr/share/vifm/colors/juef-zenburn.vifm
 
diff --git a/vim/.vimrc b/vim/.vimrc
index 6b0ae84..72ca6d7 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -221,7 +221,6 @@ let g:NERDTreeHijackNetrw = 0
 " Remembrall
 nnoremap <silent> ,, :call remembrall#remind('n', '')<cr>
 nnoremap <silent> y :<c-u>call remembrall#remind('n', 'y')<cr>
-let g:remembrall_suffixes=['', '?']
 let g:remembrall_window='botright 10new'
 
 augroup remembrall
@@ -389,8 +388,6 @@ inoreabbrev <expr> #!! "#!/usr/bin/env" . (empty(&filetype) ? '' : ' '.&filetype
 " Spell
 inoremap <c-s> <esc>1z=eA
 
-nmap co =o
-
 " }}}
 "" Colorscheme {{{
 function! SaveColo(...)