Merge pull request #95 from mizlan/master

Fix some problems with PR #94

Author: jarun

autoload/nnn.vim

@@ -233,13 +233,17 @@ function! s:switch_back(opts, Cmd)
                 \ || (type(l:layout) != v:t_string
                 \ || (type(l:layout) == v:t_string && l:layout != 'enew'))
         " delete the nnn window and buffer
-        if has('nvim')
-            if nvim_win_is_valid(l:term_wins.term.winhandle)
-                call nvim_win_close(l:term_wins.term.winhandle, v:false)
+        try
+            if has('nvim')
+                if nvim_win_is_valid(l:term_wins.term.winhandle)
+                    call nvim_win_close(l:term_wins.term.winhandle, v:false)
+                endif
+            else
+                execute win_id2win(l:term_wins.term.winhandle) . 'close'
             endif
-        else
-            call popup_close(l:term_wins.term.winhandle)
-        endif
+        catch /E444: Cannot close last window/
+	    " In case Vim complains it is the last window, fail silently.
+	endtry
         if bufexists(l:term_wins.term.buf)
             execute 'bwipeout!' l:term_wins.term.buf
         endif