From de8950635721ed7232b4f6581ea071fcd71f4410 Mon Sep 17 00:00:00 2001 From: Ingo Karkat Date: Mon, 16 Dec 2013 17:04:39 +0100 Subject: [PATCH] Remove the -count=94919 workaround for :AppendTabSession. As the command only takes the optional count _before_ the command (like :tabnew, as per the documentation), no count can be detected by -1 if we specify -range=-1. This also avoids the unexpected behavior of -count that a passed argument in the form "42foo" is parsed as count=42 and args=foo. With this change, one can properly define session names that start with numbers. --- autoload/xolox/session.vim | 2 +- plugin/session.vim | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autoload/xolox/session.vim b/autoload/xolox/session.vim index 07bd270..4b8c85b 100644 --- a/autoload/xolox/session.vim +++ b/autoload/xolox/session.vim @@ -729,7 +729,7 @@ endfunction function! xolox#session#append_tab_cmd(name, bang, count, command) abort " {{{2 try call xolox#session#change_tab_options() - execute printf('%stabnew', a:count == 94919 ? '' : a:count) + execute printf('%stabnew', a:count == -1 ? '' : a:count) call xolox#session#open_cmd(a:name, a:bang, a:command) finally call xolox#session#restore_tab_options() diff --git a/plugin/session.vim b/plugin/session.vim index 5e02ecd..90072dc 100644 --- a/plugin/session.vim +++ b/plugin/session.vim @@ -165,7 +165,7 @@ command! -bar -bang CloseSession call xolox#session#close_cmd(, 0, 1, 'C " sessions (used to persist/restore the window layout of a single tab page). command! -bar -bang -nargs=? -complete=customlist,xolox#session#complete_names OpenTabSession call xolox#session#open_tab_cmd(, , 'OpenTabSession') command! -bar -bang -nargs=? -complete=customlist,xolox#session#complete_names SaveTabSession call xolox#session#save_tab_cmd(, , 'SaveTabSession') -command! -bar -bang -count=94919 -nargs=? -complete=customlist,xolox#session#complete_names AppendTabSession call xolox#session#append_tab_cmd(, , , 'AppendTabSession') +command! -bar -bang -range=-1 -nargs=? -complete=customlist,xolox#session#complete_names AppendTabSession call xolox#session#append_tab_cmd(, , , 'AppendTabSession') command! -bar -bang CloseTabSession call xolox#session#close_tab_cmd(, 'CloseTabSession') " Define a command to restart Vim editing sessions. @@ -183,7 +183,7 @@ if g:session_command_aliases command! -bar -bang SessionClose call xolox#session#close_cmd(, 0, 1, 'SessionClose') command! -bar -bang -nargs=? -complete=customlist,xolox#session#complete_names SessionTabOpen call xolox#session#open_tab_cmd(, , 'SessionTabOpen') command! -bar -bang -nargs=? -complete=customlist,xolox#session#complete_names SessionTabSave call xolox#session#save_tab_cmd(, , 'SessionTabSave') - command! -bar -bang -count=94919 -nargs=? -complete=customlist,xolox#session#complete_names SessionTabAppend call xolox#session#append_tab_cmd(, , , 'SessionTabAppend') + command! -bar -bang -range=-1 -nargs=? -complete=customlist,xolox#session#complete_names SessionTabAppend call xolox#session#append_tab_cmd(, , , 'SessionTabAppend') command! -bar -bang SessionTabClose call xolox#session#close_tab_cmd(, 'SessionTabClose') endif