2 files changed, 10 insertions, 41 deletions
diff --git a/ftplugin/go/fmt.vim b/ftplugin/go/fmt.vim
index 5447d457..30814fdf 100644
--- a/ftplugin/go/fmt.vim
+++ b/ftplugin/go/fmt.vim
@@ -12,25 +12,11 @@
 "       It tries to preserve cursor position and avoids
 "       replacing the buffer with stderr output.
 "
-" Options:
-"
-"   g:go_fmt_commands [default=1]
-"
-"       Flag to indicate whether to enable the commands listed above.
-"
 if exists("b:did_ftplugin_go_fmt")
     finish
 endif
 
-
-if !exists("g:go_fmt_commands")
-    let g:go_fmt_commands = 1
-endif
-
-
-if g:go_fmt_commands
-    command! -buffer Fmt call s:GoFormat()
-endif
+command! -buffer Fmt call s:GoFormat()
 
 function! s:GoFormat()
     let view = winsaveview()
diff --git a/ftplugin/go/import.vim b/ftplugin/go/import.vim
index 91c8697a..1d969e46 100644
--- a/ftplugin/go/import.vim
+++ b/ftplugin/go/import.vim
@@ -24,40 +24,23 @@
 "       imported, an error will be displayed and the buffer will be
 "       untouched.
 "
-" If you would like to add shortcuts, you can do so by doing the following:
+" In addition to these commands, there are also two shortcuts mapped:
 "
-"   Import fmt
-"   au Filetype go nnoremap <buffer> <LocalLeader>f :Import fmt<CR>
+"   \f  -  Runs :Import fmt
+"   \F  -  Runs :Drop fmt
 "
-"   Drop fmt
-"   au Filetype go nnoremap <buffer> <LocalLeader>F :Drop fmt<CR>
-"
-"   Import the word under your cursor
-"   au Filetype go nnoremap <buffer> <LocalLeader>k
-"       \ :exe 'Import ' . expand('<cword>')<CR>
-"
-" The backslash '\' is the default maplocalleader, so it is possible that
+" The backslash is the default maplocalleader, so it is possible that
 " your vim is set to use a different character (:help maplocalleader).
 "
-" Options:
-"
-"   g:go_import_commands [default=1]
-"
-"       Flag to indicate whether to enable the commands listed above.
-"
 if exists("b:did_ftplugin_go_import")
     finish
 endif
 
-if !exists("g:go_import_commands")
-    let g:go_import_commands = 1
-endif
-
-if g:go_import_commands
-    command! -buffer -nargs=? -complete=customlist,go#complete#Package Drop call s:SwitchImport(0, '', <f-args>)
-    command! -buffer -nargs=1 -complete=customlist,go#complete#Package Import call s:SwitchImport(1, '', <f-args>)
-    command! -buffer -nargs=* -complete=customlist,go#complete#Package ImportAs call s:SwitchImport(1, <f-args>)
-endif
+command! -buffer -nargs=? -complete=customlist,go#complete#Package Drop call s:SwitchImport(0, '', <f-args>)
+command! -buffer -nargs=1 -complete=customlist,go#complete#Package Import call s:SwitchImport(1, '', <f-args>)
+command! -buffer -nargs=* -complete=customlist,go#complete#Package ImportAs call s:SwitchImport(1, <f-args>)
+map <buffer> <LocalLeader>f :Import fmt<CR>
+map <buffer> <LocalLeader>F :Drop fmt<CR>
 
 function! s:SwitchImport(enabled, localname, path)
     let view = winsaveview()