From e12de1a34d50cd0076b89cd273e8f5a71515ef8f Mon Sep 17 00:00:00 2001
From: "Devin J. Pohly" <djpohly@gmail.com>
Date: Fri, 29 May 2026 19:04:44 -0500
Subject: [PATCH] Use () around <Plug> mappings

<Plug> is merely a special keycode, so "<Plug>Commentary" is a prefix of
e.g. "<Plug>CommentaryLine", which means you have to wait for
'timeoutlen' before the former mapping takes place to make sure you're
not actually going to enter the latter.  (Type "gcLine" from Normal
mode, watch the 'showcmd' output and see what gets called!)

It's common practice to use parentheses to prevent one mapping from
prefixing another, so that's the fix suggested here.  (Another option
would be a terminator, as suggested in ":help using-<Plug>".)

May be related to the issue seen in #105, given that it was affected by
changes to 'timeoutlen'.
---
 plugin/commentary.vim | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/plugin/commentary.vim b/plugin/commentary.vim
index 079bce1..8671f6a 100644
--- a/plugin/commentary.vim
+++ b/plugin/commentary.vim
@@ -103,20 +103,20 @@ function! s:textobject(inner) abort
 endfunction
 
 command! -range -bar -bang Commentary call s:go(<line1>,<line2>,<bang>0)
-xnoremap <expr>   <Plug>Commentary     <SID>go()
-nnoremap <expr>   <Plug>Commentary     <SID>go()
-nnoremap <expr>   <Plug>CommentaryLine <SID>go() . '_'
-onoremap <silent> <Plug>Commentary        :<C-U>call <SID>textobject(get(v:, 'operator', '') ==# 'c')<CR>
-nnoremap <silent> <Plug>ChangeCommentary c:<C-U>call <SID>textobject(1)<CR>
+xnoremap <expr>   <Plug>(Commentary)     <SID>go()
+nnoremap <expr>   <Plug>(Commentary)     <SID>go()
+nnoremap <expr>   <Plug>(CommentaryLine) <SID>go() . '_'
+onoremap <silent> <Plug>(Commentary)        :<C-U>call <SID>textobject(get(v:, 'operator', '') ==# 'c')<CR>
+nnoremap <silent> <Plug>(ChangeCommentary) c:<C-U>call <SID>textobject(1)<CR>
 
-if !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
-  xmap gc  <Plug>Commentary
-  nmap gc  <Plug>Commentary
-  omap gc  <Plug>Commentary
-  nmap gcc <Plug>CommentaryLine
-  nmap gcu <Plug>Commentary<Plug>Commentary
+if !hasmapto('<Plug>(Commentary)') || maparg('gc','n') ==# ''
+  xmap gc  <Plug>(Commentary)
+  nmap gc  <Plug>(Commentary)
+  omap gc  <Plug>(Commentary)
+  nmap gcc <Plug>(CommentaryLine)
+  nmap gcu <Plug>(Commentary)<Plug>(Commentary)
 endif
 
-nmap <silent> <Plug>CommentaryUndo :echoerr "Change your <Plug>CommentaryUndo map to <Plug>Commentary<Plug>Commentary"<CR>
+nmap <silent> <Plug>(CommentaryUndo) :echoerr "Change your <Plug>(CommentaryUndo) map to <Plug>(Commentary)<Plug>(Commentary)"<CR>
 
 " vim:set et sw=2: