From 457c189f1655343cecda258ddf2cfb41481ecf6b Mon Sep 17 00:00:00 2001
From: Chris Toomey <chris@ctoomey.com>
Date: Fri, 14 Nov 2014 13:46:17 -0500
Subject: [PATCH] Ignore empty pane number in AttachToPane

Closes #23 - AttachToPane Ctrl-C interpreted as 0
---
 plugin/vim-tmux-runner.vim | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/plugin/vim-tmux-runner.vim b/plugin/vim-tmux-runner.vim
index 7be89d1..93a7cb2 100644
--- a/plugin/vim-tmux-runner.vim
+++ b/plugin/vim-tmux-runner.vim
@@ -48,7 +48,7 @@ endfunction
 
 function! s:RequireRunnerPane()
     if !exists("s:runner_pane")
-        echohl ErrorMsg | echom "VTR: No runner pane attached." | echohl None
+        call s:EchoError("VTR: No runner pane attached.")
         return 0
     endif
     return 1
@@ -56,7 +56,7 @@ endfunction
 
 function! s:RequireDetachedPane()
     if !exists("s:detached_window")
-        echohl ErrorMsg | echom "VTR: No detached runner pane." | echohl None
+        call s:EchoError("VTR: No detached runner pane.")
         return 0
     endif
     return 1
@@ -64,7 +64,7 @@ endfunction
 
 function! s:RequireLocalPaneOrDetached()
     if !exists('s:detached_window') && !exists('s:runner_pane')
-        echohl ErrorMsg | echom "VTR: No pane, local or detached." | echohl None
+        call s:EchoError("VTR: No pane, local or detached.")
         return 0
     endif
     return 1
@@ -209,20 +209,31 @@ function! s:_ReattachPane()
     let s:runner_pane = s:ActiveTmuxPaneNumber()
 endfunction
 
-function! s:AttachToPane()
+function! s:PromptForRunnerToAttach()
   if g:VtrDisplayPaneNumbers
     call s:SendTmuxCommand('source ~/.tmux.conf && tmux display-panes')
   endif
   echohl String | let desired_pane = input('Pane #: ') | echohl None
-  let desired_pane = str2nr(desired_pane)
-  if s:ValidRunnerPaneNumber(desired_pane)
-    let s:runner_pane = desired_pane
-    echohl String | echo "\rRunner pane set to: " . desired_pane | echohl None
+  if desired_pane != ''
+    call s:AttachToPane(str2nr(desired_pane))
   else
-    echohl ErrorMsg | echo "\rInvalid pane number: " . desired_pane | echohl None
+    call s:EchoError("No pane specified. Cancelling.")
   endif
 endfunction
 
+function! s:AttachToPane(desired_pane)
+  if s:ValidRunnerPaneNumber(a:desired_pane)
+    let s:runner_pane = a:desired_pane
+    echohl String | echo "\rRunner pane set to: " . a:desired_pane | echohl None
+  else
+    call s:EchoError("Invalid pane number: " . a:desired_pane)
+  endif
+endfunction
+
+function! s:EchoError(message)
+  echohl ErrorMsg | echo "\r". a:message | echohl None
+endfunction
+
 function! s:ValidRunnerPaneNumber(desired_pane)
   if a:desired_pane == s:ActiveTmuxPaneNumber() | return 0 | endif
   if a:desired_pane > len(s:TmuxPanes()) | return 0 | endif
@@ -305,7 +316,7 @@ function! s:SendCommandToRunner(...)
     let escaped_empty_string = "''"
     if s:user_command == escaped_empty_string
         unlet s:user_command
-        echohl ErrorMsg | echom "VTR: command string required" | echohl None
+        call s:EchoError("VTR: command string required")
         return
     endif
     call s:EnsureRunnerPane()
@@ -397,7 +408,7 @@ function! s:DefineCommands()
     command! VtrClearRunner call s:SendClearSequence()
     command! VtrFlushCommand call s:FlushCommand()
     command! VtrSendCtrlD call s:SendCtrlD()
-    command! VtrAttachToPane call s:AttachToPane()
+    command! VtrAttachToPane call s:PromptForRunnerToAttach()
     command! VtrZoomRunnerPane call s:ZoomRunnerPane()
 endfunction