Exit copy-mode when clearing terminal screen (#233)

preservim · Sep 26, 2024 · 7db6b2f · 7db6b2f
1 parent 64df7ce
commit 7db6b2f
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/plugin/vimux.vim b/plugin/vimux.vim
@@ -74,16 +74,8 @@ function! VimuxRunCommand(command, ...) abort
   let l:resetSequence = VimuxOption('VimuxResetSequence')
   let g:VimuxLastCommand = a:command
 
-  try
-    call VimuxTmux('copy-mode -q -t '.g:VimuxRunnerIndex)
-  catch
-    let l:versionString = s:tmuxProperty('#{version}')
-    if str2float(l:versionString) < 3.2
-        let l:resetSequence = 'q '.l:resetSequence
-    endif
-  endtry
+  call s:exitCopyMode()
   call VimuxSendKeys(l:resetSequence)
-
   call VimuxSendText(a:command)
   if l:autoreturn ==# 1
     call VimuxSendKeys('Enter')
@@ -178,6 +170,7 @@ endfunction
 
 function! VimuxClearTerminalScreen() abort
   if exists('g:VimuxRunnerIndex') && s:hasRunner(g:VimuxRunnerIndex) !=# -1
+    call s:exitCopyMode()
     call VimuxSendKeys('C-l')
   endif
 endfunction
@@ -217,6 +210,17 @@ function! VimuxTmux(arguments) abort
   endif
 endfunction
 
+function! s:exitCopyMode() abort
+  try
+    call VimuxTmux('copy-mode -q -t '.g:VimuxRunnerIndex)
+  catch
+    let l:versionString = s:tmuxProperty('#{version}')
+    if str2float(l:versionString) < 3.2
+        call VimuxSendKeys('q')
+    endif
+  endtry
+endfunction
+
 function! s:tmuxSession() abort
   return s:tmuxProperty('#S')
 endfunction