diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim index f881453..3317c1e 100644 --- a/plugin/NERD_commenter.vim +++ b/plugin/NERD_commenter.vim @@ -2793,7 +2793,8 @@ if g:NERDMenuMode != 0 endif function! s:CreateMenuItems(modes, target, desc) - for mode in split(a:modes, '\zs') + let modes = (a:modes == '') ? [''] : split(a:modes, '\zs') + for mode in modes exec mode . 'menu ' . g:menuRoot . '.' . a:desc . ' ' . a:target endfor endfunction @@ -2801,19 +2802,19 @@ if g:NERDMenuMode != 0 call s:CreateMenuItems('nv', 'NERDCommenterToggle', 'Toggle') call s:CreateMenuItems('nv', 'NERDCommenterMinimal', 'Minimal') call s:CreateMenuItems('nv', 'NERDCommenterNest', 'Nested') - exec 'nmenu '. menuRoot .'.To\ EOL NERDCommenterToEOL' + 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') - exec 'nmenu '. menuRoot .'.Append NERDCommenterAppend' - exec 'menu '. menuRoot .'.-Sep- :' + 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') - exec 'menu '. menuRoot .'.-Sep2- :' + call s:CreateMenuItems('', ':', '-Sep2-') call s:CreateMenuItems('nv', 'NERDCommenterUncomment', 'Uncomment') - exec 'nmenu '. menuRoot .'.Switch\ Delimiters NERDCommenterAltDelims' - exec 'imenu '. menuRoot .'.Insert\ Comment\ Here NERDCommenterInInsert' - exec 'menu '. menuRoot .'.-Sep3- :' - exec 'menu '. menuRoot .'.Help :help NERDCommenterContents' + 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') endif " vim: set foldmethod=marker :