1 files changed, 15 insertions, 11 deletions

diff --git a/vimrc-full b/vimrc-full
index 80902de..4833a6a 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -421,8 +421,8 @@ if has("autocmd")
       endif
     endfunction
 
-    nmap <script> <silent> <F2> :call QFixToggle(0)<CR>
-    nmap <script> <silent> <F3> :call ToggleQuickFix()<CR>
+    nmap <script> <silent> <F7> :call QFixToggle(0)<CR>
+    nmap <script> <silent> <F8> :call ToggleQuickFix()<CR>
   augroup END
 
   augroup CurrentFileName
@@ -450,13 +450,13 @@ if has("autocmd")
         01menu &Functions.help
               \<Tab><F1>
               \ <F1>
-        01menu &Functions.copen\:\ show\ quickfix\ list
+        01menu &Functions.bp:\ previous\ buffer
               \<Tab><F2>
               \ <F2>
-        01menu &Functions.lopen\:\ show\ location\ list
+        01menu &Functions.bn:\ next\ buffer
               \<Tab><F3>
               \ <F3>
-        01menu &Functions.unef4
+        01menu &Functions.^wc\:\ close\ window
               \<Tab><F4>
               \ <F4>
         01menu &Functions.-Sep1- :
@@ -467,10 +467,10 @@ if has("autocmd")
         01menu &Functions.clear\ matches,\ update\ viewport
               \<Tab><F6>
               \ <F6>
-        01menu &Functions.undef7
+        01menu &Functions.copen\:\ show\ quickfix\ list
               \<Tab><F7>
               \ <F7>
-        01menu &Functions.undef8
+        01menu &Functions.lopen\:\ show\ location\ list
               \<Tab><F8>
               \ <F8>
         01menu &Functions.-Sep2- :
@@ -709,11 +709,15 @@ nnoremap <expr>
        \ <leader><leader>
        \ bufwinnr("%")==g:NERDTree.GetWinNum() ? ':NERDTreeClose<CR>' : ':NERDTreeFind<CR>'
 nnoremap <expr>
-       \ <Tab>
-       \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':bn<CR>'
+       \ <F2>
+       \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':N<CR>'
+
 nnoremap <expr>
-       \ <S-Tab>
-       \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':bp<CR>'
+       \ <F3>
+       \ bufwinnr("%")==g:NERDTree.GetWinNum() ? '<C-W><C-W>' : ':n<CR>'
+
+nnoremap <F4>
+       \ :wincmd c<CR>
 " close NERDTree if it is the last remaining window (taken from the official documentation)
 " autocmd bufenter *
 "       \ if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif