patch 7.4.1945v7.4.1945

Problem:    The Man plugin doesn't work that well.
Solution:   Use "g:ft_man_open_mode" to be able open man pages in vert split
            or separate tab. Set nomodifiable for buffer with man content. Add
            a test. (Andrey Starodubtsev, closes #873)

3 files changed, 62 insertions, 0 deletions

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 57f8283f0..2dbdc3273 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -175,6 +175,7 @@ NEW_TESTS = test_arglist.res \
 	    test_increment.res \
 	    test_json.res \
 	    test_langmap.res \
+	    test_man.res \
 	    test_matchadd_conceal.res \
 	    test_packadd.res \
 	    test_perl.res \
diff --git a/src/testdir/test_man.vim b/src/testdir/test_man.vim
new file mode 100644
index 000000000..f2c48a405
--- /dev/null
+++ b/src/testdir/test_man.vim
@@ -0,0 +1,59 @@
+runtime ftplugin/man.vim
+
+function Test_g_ft_man_open_mode()
+  let l:w = winwidth(1)
+  vnew
+  let l:h = winheight(1)
+  q
+
+  " split horizontally
+  let wincnt = winnr('$')
+  Man 'vim'
+  if wincnt == winnr('$')
+    " Vim manual page cannot be found.
+    return
+  endif
+  call assert_equal(l:w, winwidth(1))
+  call assert_true(l:h > winheight(1))
+  call assert_equal(1, tabpagenr('$'))
+  call assert_equal(1, tabpagenr())
+  q
+
+  " split horizontally
+  let g:ft_man_open_mode = "horz"
+  Man 'vim'
+  call assert_equal(l:w, winwidth(1))
+  call assert_true(l:h > winheight(1))
+  call assert_equal(1, tabpagenr('$'))
+  call assert_equal(1, tabpagenr())
+  q
+
+  " split vertically
+  let g:ft_man_open_mode = "vert"
+  Man 'vim'
+  call assert_true(l:w > winwidth(1))
+  call assert_equal(l:h, winheight(1))
+  call assert_equal(1, tabpagenr('$'))
+  call assert_equal(1, tabpagenr())
+  q
+
+  " separate tab
+  let g:ft_man_open_mode = "tab"
+  Man 'vim'
+  call assert_equal(l:w, winwidth(1))
+  call assert_equal(l:h, winheight(1))
+  call assert_equal(2, tabpagenr('$'))
+  call assert_equal(2, tabpagenr())
+  q
+endfunction
+
+function Test_nomodifiable()
+  let wincnt = winnr('$')
+  Man 'vim'
+  if wincnt == winnr('$')
+    " Vim manual page cannot be found.
+    return
+  endif
+  call assert_false(&l:modifiable)
+  q
+endfunction
diff --git a/src/version.c b/src/version.c
index d1683fecb..bef210aac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1945,
+/**/
     1944,
 /**/
     1943,