From e52cb4d77fae016639dba005c44e86722498ab3c Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Thu, 28 Apr 2022 22:05:14 -0400
Subject: [PATCH] Provide 'colorcolumn' option maps on "t"

Resolves: https://github.com/tpope/vim-unimpaired/pull/203
Resolves: https://github.com/tpope/vim-unimpaired/pull/224
---
 doc/unimpaired.txt    |  1 +
 plugin/unimpaired.vim | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/doc/unimpaired.txt b/doc/unimpaired.txt
index 79b1aca..b03f42f 100644
--- a/doc/unimpaired.txt
+++ b/doc/unimpaired.txt
@@ -86,6 +86,7 @@ On	Off	Toggle	Option
 *[on*	*]on*	*yon*	'number'
 *[or*	*]or*	*yor*	'relativenumber'
 *[os*	*]os*	*yos*	'spell'
+*[ot*	*]ot*	*yot*	'colorcolumn' ("+1" or last used value)
 *[ou*	*]ou*	*you*	'cursorcolumn'
 *[ov*	*]ov*	*yov*	'virtualedit'
 *[ow*	*]ow*	*yow*	'wrap'
diff --git a/plugin/unimpaired.vim b/plugin/unimpaired.vim
index df33cb7..e078829 100644
--- a/plugin/unimpaired.vim
+++ b/plugin/unimpaired.vim
@@ -346,6 +346,16 @@ nmap <script> <Plug>(unimpaired-enable)+  :<C-U>set cursorline cursorcolumn<CR>
 nmap <script> <Plug>(unimpaired-disable)+ :<C-U>set nocursorline nocursorcolumn<CR>
 nmap <script> <Plug>(unimpaired-toggle)+  :<C-U>set <C-R>=<SID>CursorOptions()<CR><CR>
 
+function! s:ColorColumn(should_clear) abort
+  if !empty(&colorcolumn)
+    let s:colorcolumn = &colorcolumn
+  endif
+  return a:should_clear ? '' : get(s:, 'colorcolumn', get(g:, 'unimpaired_colorcolumn', '+1'))
+endfunction
+nmap <script> <Plug>(unimpaired-enable)t  :<C-U>set colorcolumn=<C-R>=<SID>ColorColumn(0)<CR><CR>
+nmap <script> <Plug>(unimpaired-disable)t :<C-U>set colorcolumn=<C-R>=<SID>ColorColumn(1)<CR><CR>
+nmap <script> <Plug>(unimpaired-toggle)t  :<C-U>set colorcolumn=<C-R>=<SID>ColorColumn(!empty(&cc))<CR><CR>
+
 exe s:Map('n', 'yo', '<Plug>(unimpaired-toggle)')
 exe s:Map('n', '[o', '<Plug>(unimpaired-enable)')
 exe s:Map('n', ']o', '<Plug>(unimpaired-disable)')