Merge pull request #3047 from bhcleek/debug/halt-mapping

debug: resolve mapping collision
fatih · Oct 9, 2020 · 6118f6d · 6118f6d
2 parents 8077af3 + f057c77
commit 6118f6d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/autoload/go/debug.vim b/autoload/go/debug.vim
@@ -528,7 +528,7 @@ function! s:continue()
     autocmd FileType go nmap <buffer> <F9>   <Plug>(go-debug-breakpoint)
     autocmd FileType go nmap <buffer> <F10>  <Plug>(go-debug-next)
     autocmd FileType go nmap <buffer> <F11>  <Plug>(go-debug-step)
-    autocmd FileType go nmap <buffer> <F6>  <Plug>(go-debug-halt)
+    autocmd FileType go nmap <buffer> <F8>  <Plug>(go-debug-halt)
   augroup END
   doautocmd vim-go-debug FileType go
 endfunction

diff --git a/doc/vim-go.txt b/doc/vim-go.txt
@@ -2304,7 +2304,7 @@ The program will halt on the breakpoint, at which point you can inspect the
 program state. You can go to the next line with |:GoDebugNext| (<F10>) or step
 in with |:GoDebugStep| (<F11>).
 
-The program can also be halted with `:GoDebugHalt` (<F6>).
+The program can also be halted with `:GoDebugHalt` (<F8>).
 
 The variable window in the bottom left (`GODEBUG_VARIABLES`) will display all
 local variables. Struct values are displayed as `{...}`, array/slices as
@@ -2380,7 +2380,7 @@ The rest of the commands and mappings become available after executing
 
     Halt the program.
 
-    Mapped to <F6> by default.
+    Mapped to <F8> by default.
 
                                                                 *:GoDebugStop*
                                                              *(go-debug-stop)*