To: vim_dev@googlegroups.com Subject: Patch 8.1.2355 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2355 Problem: Test with "man" fails on FreeBSD. Solution: Use "-P" instead of "--pager". Files: src/testdir/test_normal.vim *** ../vim-8.1.2354/src/testdir/test_normal.vim 2019-10-28 02:12:32.811459384 +0100 --- src/testdir/test_normal.vim 2019-11-28 21:14:47.818068243 +0100 *************** *** 1204,1211 **** return endif ! if has('mac') ! " In MacOS, the option for specifying a pager is different set keywordprg=man\ -P\ cat else set keywordprg=man\ --pager=cat --- 1204,1211 ---- return endif ! if has('mac') || has('bsd') ! " In MacOS and BSD, the option for specifying a pager is different set keywordprg=man\ -P\ cat else set keywordprg=man\ --pager=cat *** ../vim-8.1.2354/src/version.c 2019-11-28 20:53:03.010370472 +0100 --- src/version.c 2019-11-28 21:15:47.101832959 +0100 *************** *** 739,740 **** --- 739,742 ---- { /* Add new patch number below this line */ + /**/ + 2355, /**/ -- "The sun oozed over the horizon, shoved aside darkness, crept along the greensward, and, with sickly fingers, pushed through the castle window, revealing the pillaged princess, hand at throat, crown asunder, gaping in frenzied horror at the sated, sodden amphibian lying beside her, disbelieving the magnitude of the frog's deception, screaming madly, "You lied!" - Winner of the Bulwer-Lytton contest (San Jose State University), wherein one writes only the first line of a bad novel /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///