Skip to content
This repository
Browse code

Work around &shellslash setting on Windows

  • Loading branch information...
commit 0da0b0d7eb87ac738d8c9b764c56ee98fd6e98ae 1 parent ef35a59
Peter Odding authored

Showing 1 changed file with 7 additions and 7 deletions. Show diff stats Hide diff stats

  1. 14  autoload/xolox/easytags.vim
14  autoload/xolox/easytags.vim
... ...
@@ -1,9 +1,9 @@
1 1
 " Vim script
2 2
 " Author: Peter Odding <peter@peterodding.com>
3  
-" Last Change: October 29, 2011
  3
+" Last Change: November 21, 2011
4 4
 " URL: http://peterodding.com/code/vim/easytags/
5 5
 
6  
-let g:xolox#easytags#version = '2.7.2'
  6
+let g:xolox#easytags#version = '2.7.3'
7 7
 
8 8
 " Public interface through (automatic) commands. {{{1
9 9
 
@@ -160,7 +160,7 @@ function! s:prep_cmdline(cfile, tagsfile, firstrun, arguments, context) " {{{3
160 160
   let program = xolox#misc#option#get('easytags_cmd')
161 161
   let cmdline = [program, '--fields=+l', '--c-kinds=+p', '--c++-kinds=+p']
162 162
   if a:firstrun
163  
-    call add(cmdline, shellescape('-f' . a:tagsfile))
  163
+    call add(cmdline, xolox#misc#escape#shell('-f' . a:tagsfile))
164 164
     call add(cmdline, '--sort=' . (&ic ? 'foldcase' : 'yes'))
165 165
   else
166 166
     call add(cmdline, '--sort=no')
@@ -173,13 +173,13 @@ function! s:prep_cmdline(cfile, tagsfile, firstrun, arguments, context) " {{{3
173 173
   if a:cfile != ''
174 174
     if xolox#misc#option#get('easytags_autorecurse', 0)
175 175
       call add(cmdline, '-R')
176  
-      call add(cmdline, shellescape(a:cfile))
  176
+      call add(cmdline, xolox#misc#escape#shell(a:cfile))
177 177
     else
178 178
       " TODO Should --language-force distinguish between C and C++?
179 179
       " TODO --language-force doesn't make sense for JavaScript tags in HTML files?
180 180
       let filetype = xolox#easytags#to_ctags_ft(&filetype)
181  
-      call add(cmdline, shellescape('--language-force=' . filetype))
182  
-      call add(cmdline, shellescape(a:cfile))
  181
+      call add(cmdline, xolox#misc#escape#shell('--language-force=' . filetype))
  182
+      call add(cmdline, xolox#misc#escape#shell(a:cfile))
183 183
     endif
184 184
     let have_args = 1
185 185
   else
@@ -190,7 +190,7 @@ function! s:prep_cmdline(cfile, tagsfile, firstrun, arguments, context) " {{{3
190 190
       else
191 191
         let matches = split(expand(arg), "\n")
192 192
         if !empty(matches)
193  
-          call map(matches, 'shellescape(s:canonicalize(v:val, a:context))')
  193
+          call map(matches, 'xolox#misc#escape#shell(s:canonicalize(v:val, a:context))')
194 194
           call extend(cmdline, matches)
195 195
           let have_args = 1
196 196
         endif

0 notes on commit 0da0b0d

Please sign in to comment.
Something went wrong with that request. Please try again.