Permalink
Browse files

Rename xolox#shell#escape() to xolox#misc#escape#shell()

  • Loading branch information...
1 parent f665486 commit 8c600e959c760b3865072ce19bc69cc7a98b8193 @xolox committed Nov 21, 2011
Showing with 4 additions and 18 deletions.
  1. +4 −18 autoload/xolox/shell.vim
@@ -1,9 +1,9 @@
" Vim auto-load script
" Author: Peter Odding <peter@peterodding.com>
-" Last Change: November 11, 2011
+" Last Change: November 21, 2011
" URL: http://peterodding.com/code/vim/shell/
-let g:xolox#shell#version = '0.9.21'
+let g:xolox#shell#version = '0.9.22'
if !exists('s:fullscreen_enabled')
let s:enoimpl = "%s() hasn't been implemented on your platform! %s"
@@ -122,11 +122,11 @@ function! xolox#shell#execute(command, synchronous, ...) " -- execute external c
if has_input
let tempin = tempname()
call writefile(type(a:1) == type([]) ? a:1 : split(a:1, "\n"), tempin)
- let cmd .= ' < ' . xolox#shell#escape(tempin)
+ let cmd .= ' < ' . xolox#misc#escape#shell(tempin)
endif
if a:synchronous
let tempout = tempname()
- let cmd .= ' > ' . xolox#shell#escape(tempout) . ' 2>&1'
+ let cmd .= ' > ' . xolox#misc#escape#shell(tempout) . ' 2>&1'
endif
if xolox#misc#os#is_win() && s:has_dll()
let fn = 'execute_' . (a:synchronous ? '' : 'a') . 'synchronous'
@@ -162,20 +162,6 @@ function! xolox#shell#execute(command, synchronous, ...) " -- execute external c
endtry
endfunction
-function! xolox#shell#escape(argument) " -- quote command line arguments {{{1
- if xolox#misc#os#is_win()
- try
- let ssl_save = &shellslash
- set noshellslash
- return shellescape(a:argument)
- finally
- let &shellslash = ssl_save
- endtry
- else
- return shellescape(a:argument)
- endif
-endfunction
-
function! xolox#shell#maximize(...) " -- show/hide Vim's menu, tool bar and/or tab line {{{1
let new_state = a:0 == 0 ? !s:maximized : a:1
if new_state && !s:maximized

0 comments on commit 8c600e9

Please sign in to comment.