ZyX_I avatar ZyX_I committed 2dd4ff3

@%aurum/drivers/common/utils: Fixed shell calls without python
@%aurum/maputils: Moved warning message so that it is displayed after prompting user and is more likely to be noticed

Comments (0)

Files changed (2)

autoload/aurum/drivers/common/utils.vim

         if has_key(s:F, 'readsystem')
             return s:F.readsystem(a:cmd, a:cdpath)
         elseif !empty(&shellredir)
-            let lines=call(s:F.readsystem, [a:cmd]+(empty(a:cdpath)?
-                        \                               ([]):
-                        \                               ([a:cdpath])), {})
+            let lines=call(s:_r.os.readsystem, [a:cmd]+(empty(a:cdpath)?
+                        \                                 ([]):
+                        \                                 ([a:cdpath])), {})
             return [lines, v:shell_error]
         endif
     endif

autoload/aurum/maputils.vim

         lockvar s:plug
     endif
     if s:plug is -1
-        call s:_f.warn('plinst')
-        let choice=inputlist(['Select file (0 to cancel):']+
-                    \        map(copy(a:files), '(v:key+1).". ".v:val'))
-        if choice
-            return call(a:cbargs[0], [a:files[choice-1]]+a:cbargs[1:], {})
-        endif
+        try
+            let choice=inputlist(['Select file (0 to cancel):']+
+                        \        map(copy(a:files), '(v:key+1).". ".v:val'))
+            if choice
+                return call(a:cbargs[0], [a:files[choice-1]]+a:cbargs[1:], {})
+            endif
+        finally
+            call s:_f.warn('plinst')
+        endtry
     else
         return s:plug.call(a:files, a:cbargs, a:pvargs)
     endif
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.