Tentatively finalize maps

Author: tpope

doc/dispatch.txt

@@ -124,23 +124,24 @@ COMMANDS                                        *dispatch-commands*
 
 MAPS                                            *dispatch-maps*
 
-                                                *dispatch-`<CR>*
-`<CR>                   Equivalent to |:Dispatch|<CR>.
-
-                                                *dispatch-`<Space>*
-`<Space>                Equivalent to |:Dispatch|<Space>.
-
-                                                *dispatch-`!*
-`!                      Equivalent to |:Dispatch!|.
-
-                                                *dispatch-m<CR>*
-m<CR>                   Equivalent to |:Make|<CR>.
-
-                                                *dispatch-m<Space>*
-m<Space>                Equivalent to |:Make|<Space>.
-
-                                                *dispatch-m!*
-m!                      Equivalent to |:Make!|.
+The following convenience maps are provided.
+
+*m<CR>*                   |:Make|<CR>
+*m<Space>*                |:Make|<Space>
+*m!*                      |:Make|!
+*m?*                      Show 'makeprg'
+*`<CR>*                   |:Dispatch|<CR>
+*`<Space>*                |:Dispatch|<Space>
+*`!*                      |:Dispatch|!
+*`?*                      |:FocusDispatch|<CR>
+*'<CR>*                   |:Start|<CR>
+*'<Space>*                |:Start|<Space>
+*'!*                      |:Start|!
+*'?*                      Show |b:start|
+*g'<CR>*                  |:Spawn|<CR>
+*g'<Space>*               |:Spawn|<Space>
+*g'!*                     |:Spawn|!
+*g'?*                     Show 'shell'
 
 Use the g:nremap dictionary to override an individual map or set of maps with
 a common prefix.  For example, the following changes all "m" maps to "q" maps:

plugin/dispatch.vim

@@ -54,18 +54,23 @@ function! s:map(mode, lhs, rhs, ...) abort
 endfunction
 
 nmap <script> <SID>:.    :<C-R>=getcmdline() =~ ',' ? "\0250" : ""<CR>
-call s:map('n', 'm<CR>', '<SID>:.Make<CR>')
-call s:map('n', 'm<Space>', '<SID>:.Make<Space>')
-call s:map('n', 'm!', '<SID>:.Make!')
-call s:map('n', 'ym<CR>', '<SID>:.Make<CR>')
-call s:map('n', 'ym<Space>', '<SID>:.Make<Space>')
-call s:map('n', 'ym!', '<SID>:.Make!')
-call s:map('n', '`<CR>', '<SID>:.Dispatch<CR>')
-call s:map('n', '`<Space>', '<SID>:.Dispatch<Space>')
-call s:map('n', '`!', '<SID>:.Dispatch!')
-call s:map('n', 'yd<CR>', '<SID>:.Dispatch<CR>')
-call s:map('n', 'yd<Space>', '<SID>:.Dispatch<Space>')
-call s:map('n', 'yd!', '<SID>:.Dispatch!')
+
+call s:map('n', 'm<CR>',      '<SID>:.Make<CR>')
+call s:map('n', 'm<Space>',   '<SID>:.Make<Space>')
+call s:map('n', 'm!',         '<SID>:.Make!')
+call s:map('n', 'm?',         ':<C-U>echo ":Dispatch" &makeprg<CR>')
+call s:map('n', '`<CR>',      '<SID>:.Dispatch<CR>')
+call s:map('n', '`<Space>',   '<SID>:.Dispatch<Space>')
+call s:map('n', '`!',         '<SID>:.Dispatch!')
+call s:map('n', '`?',         '<SID>:.FocusDispatch<CR>')
+call s:map('n', '''<CR>',     '<SID>:.Start<CR>')
+call s:map('n', '''<Space>',  '<SID>:.Start<Space>')
+call s:map('n', '''!',        '<SID>:.Start!')
+call s:map('n', '''?',        ':<C-U>echo ":Start" get(b:,"start",&shell)<CR>')
+call s:map('n', 'g''<CR>',    '<SID>:.Spawn<CR>')
+call s:map('n', 'g''<Space>', '<SID>:.Spawn<Space>')
+call s:map('n', 'g''!',       '<SID>:.Spawn!')
+call s:map('n', 'g''?',       ':<C-U>echo ":Spawn" &shell<CR>')
 
 function! DispatchComplete(id) abort
   return dispatch#complete(a:id)