diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim index b7614af..084781b 100644 --- a/plugin/NERD_commenter.vim +++ b/plugin/NERD_commenter.vim @@ -2761,15 +2761,15 @@ if g:NERDCreateDefaultMappings call s:CreateMaps('NERDCommenterComment', 'cc') call s:CreateMaps('NERDCommenterToggle', 'c') call s:CreateMaps('NERDCommenterMinimal', 'cm') - call s:CreateMaps('NERDCommenterSexy', 'cs') + call s:CreateMaps('NERDCommenterNest', 'cn') + call s:CreateMaps('NERDCommenterToEOL', 'c$') call s:CreateMaps('NERDCommenterInvert', 'ci') + call s:CreateMaps('NERDCommenterSexy', 'cs') call s:CreateMaps('NERDCommenterYank', 'cy') + call s:CreateMaps('NERDCommenterAppend', 'cA') call s:CreateMaps('NERDCommenterAlignLeft', 'cl') call s:CreateMaps('NERDCommenterAlignBoth', 'cb') - call s:CreateMaps('NERDCommenterNest', 'cn') call s:CreateMaps('NERDCommenterUncomment', 'cu') - call s:CreateMaps('NERDCommenterToEOL', 'c$') - call s:CreateMaps('NERDCommenterAppend', 'cA') if !hasmapto('NERDCommenterAltDelims', 'n') nmap ca NERDCommenterAltDelims @@ -2783,32 +2783,37 @@ endif "check if the user wants the menu to be displayed if g:NERDMenuMode != 0 - function! s:CreateMenuItems(modes, target, desc) + function! s:CreateMenuItems(modes, target, desc, combo) let menuRoot = get(['', 'comment', '&comment', '&Plugin.&comment'], \ g:NERDMenuMode, '') - let command = 'menu ' . menuRoot . '.' + let command = 'menu ' . menuRoot . '.' . escape(a:desc, ' ') + let leader = escape(exists('mapleader') ? mapleader : '\', '\') + if strlen(a:combo) + let command .= '' . leader . a:combo + endif + let command .= ' ' . a:target let modes = (a:modes == '') ? [''] : split(a:modes, '\zs') for mode in modes - exec mode . command . a:desc . ' ' . a:target + exec mode . command endfor endfunction - call s:CreateMenuItems('nv', 'NERDCommenterComment', 'Comment') - call s:CreateMenuItems('nv', 'NERDCommenterToggle', 'Toggle') - call s:CreateMenuItems('nv', 'NERDCommenterMinimal', 'Minimal') - call s:CreateMenuItems('nv', 'NERDCommenterNest', 'Nested') - call s:CreateMenuItems('n', 'NERDCommenterToEOL', 'To\ EOL') - call s:CreateMenuItems('nv', 'NERDCommenterInvert', 'Invert') - call s:CreateMenuItems('nv', 'NERDCommenterSexy', 'Sexy') - call s:CreateMenuItems('nv', 'NERDCommenterYank', 'Yank\ then\ comment') - call s:CreateMenuItems('n', 'NERDCommenterAppend', 'Append') - call s:CreateMenuItems('', ':', '-Sep-') - call s:CreateMenuItems('nv', 'NERDCommenterAlignLeft', 'Left\ aligned') - call s:CreateMenuItems('nv', 'NERDCommenterAlignBoth', 'Left\ and\ right\ aligned') - call s:CreateMenuItems('', ':', '-Sep2-') - call s:CreateMenuItems('nv', 'NERDCommenterUncomment', 'Uncomment') - call s:CreateMenuItems('n', 'NERDCommenterAltDelims', 'Switch\ Delimiters') - call s:CreateMenuItems('i', 'NERDCommenterInInsert', 'Insert\ Comment\ Here') - call s:CreateMenuItems('', ':', '-Sep3-') - call s:CreateMenuItems('', ':help NERDCommenterContents', 'Help') + call s:CreateMenuItems('nv', 'NERDCommenterComment', 'Comment', 'cc') + call s:CreateMenuItems('nv', 'NERDCommenterToggle', 'Toggle', 'c') + call s:CreateMenuItems('nv', 'NERDCommenterMinimal', 'Minimal', 'cm') + call s:CreateMenuItems('nv', 'NERDCommenterNest', 'Nested', 'cn') + call s:CreateMenuItems('n', 'NERDCommenterToEOL', 'To EOL', 'c$') + call s:CreateMenuItems('nv', 'NERDCommenterInvert', 'Invert', 'ci') + call s:CreateMenuItems('nv', 'NERDCommenterSexy', 'Sexy', 'cs') + call s:CreateMenuItems('nv', 'NERDCommenterYank', 'Yank then comment', 'cy') + call s:CreateMenuItems('n', 'NERDCommenterAppend', 'Append', 'cA') + call s:CreateMenuItems('', ':', '-Sep-', '') + call s:CreateMenuItems('nv', 'NERDCommenterAlignLeft', 'Left aligned', 'cl') + call s:CreateMenuItems('nv', 'NERDCommenterAlignBoth', 'Left and right aligned', 'cb') + call s:CreateMenuItems('', ':', '-Sep2-', '') + call s:CreateMenuItems('nv', 'NERDCommenterUncomment', 'Uncomment', 'cu') + call s:CreateMenuItems('n', 'NERDCommenterAltDelims', 'Switch Delimiters', 'ca') + call s:CreateMenuItems('i', 'NERDCommenterInInsert', 'Insert Comment Here', '') + call s:CreateMenuItems('', ':', '-Sep3-', '') + call s:CreateMenuItems('', ':help NERDCommenterContents', 'Help', '') endif " vim: set foldmethod=marker :