From 39777ad4b8fdd4e09df85025667845b43e1f2d72 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Tue, 21 Aug 2018 12:04:44 -0400
Subject: vim-patch:8.0.1426: "gf" and <cfile> don't accept ? and & in URL

Problem:    "gf" and <cfile> don't accept ? and & in URL. (Dmitrii Tcyganok)
Solution:   Check for a URL and allow for extra characters. (closes vim/vim#2493)
https://github.com/vim/vim/commit/9e3dfc650190e96739abc004eb9948afa68136b4
---
 src/nvim/testdir/test_gf.vim | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_gf.vim b/src/nvim/testdir/test_gf.vim
index ef1bf1075b..c352379697 100644
--- a/src/nvim/testdir/test_gf.vim
+++ b/src/nvim/testdir/test_gf.vim
@@ -7,7 +7,8 @@ func Test_gf_url()
       \ "first test for URL://machine.name/tmp/vimtest2a and other text",
       \ "second test for URL://machine.name/tmp/vimtest2b. And other text",
       \ "third test for URL:\\\\machine.name\\vimtest2c and other text",
-      \ "fourth test for URL:\\\\machine.name\\tmp\\vimtest2d, and other text"
+      \ "fourth test for URL:\\\\machine.name\\tmp\\vimtest2d, and other text",
+      \ "fifth test for URL://machine.name/tmp?q=vim&opt=yes and other text",
       \ ])
   call cursor(1,1)
   call search("^first")
@@ -28,6 +29,10 @@ func Test_gf_url()
   call search("URL")
   call assert_equal("URL:\\\\machine.name\\tmp\\vimtest2d", expand("<cfile>"))
 
+  call search("^fifth")
+  call search("URL")
+  call assert_equal("URL://machine.name/tmp?q=vim&opt=yes", expand("<cfile>"))
+
   set isf&vim
   enew!
 endfunc
-- 
cgit 


From 54e6ef73f058f3e3a340addd6354cf70e2fd11b7 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <janedmundlazo@hotmail.com>
Date: Tue, 21 Aug 2018 22:18:15 -0400
Subject: vim-patch:8.0.1790: 'winfixwidth' is not always respected by :close

Problem:    'winfixwidth' is not always respected by :close.
Solution:   Prefer a frame without 'winfixwidth' or 'winfixheight'. (Jason
            Franklin)
https://github.com/vim/vim/commit/c136af29c0b1939076fbae7d36afd90dce740315
---
 src/nvim/testdir/test_winbuf_close.vim | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'src/nvim/testdir')

diff --git a/src/nvim/testdir/test_winbuf_close.vim b/src/nvim/testdir/test_winbuf_close.vim
index ed64dd79b7..e4618610cd 100644
--- a/src/nvim/testdir/test_winbuf_close.vim
+++ b/src/nvim/testdir/test_winbuf_close.vim
@@ -122,3 +122,39 @@ func Test_winbuf_close()
   call delete('Xtest2')
   call delete('Xtest3')
 endfunc
+
+" Test that ":close" will respect 'winfixheight' when possible.
+func Test_winfixheight_on_close()
+  set nosplitbelow nosplitright
+
+  split | split | vsplit
+
+  $wincmd w
+  setlocal winfixheight
+  let l:height = winheight(0)
+
+  3close
+
+  call assert_equal(l:height, winheight(0))
+
+  %bwipeout!
+  setlocal nowinfixheight splitbelow& splitright&
+endfunc
+
+" Test that ":close" will respect 'winfixwidth' when possible.
+func Test_winfixwidth_on_close()
+  set nosplitbelow nosplitright
+
+  vsplit | vsplit | split
+
+  $wincmd w
+  setlocal winfixwidth
+  let l:width = winwidth(0)
+
+  3close
+
+  call assert_equal(l:width, winwidth(0))
+
+  %bwipeout!
+  setlocal nowinfixwidth splitbelow& splitright&
+endfunction
-- 
cgit