Commits

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

  • Participants
  • Parent commits 5c071d7

Comments (0)

Files changed (2)

File 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

File 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