To: vim_dev@googlegroups.com Subject: Patch 8.1.2182 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.2182 Problem: Test42 seen as binary by git diff. Solution: Add .gitattributes file. Make explicit that 'cpo' does not contain 'S'. (Daniel Hahler, closes #5072) Files: .gitattributes, Filelist, src/testdir/test42.in *** ../vim-8.1.2181/.gitattributes 2019-10-19 18:37:13.657318891 +0200 --- .gitattributes 2019-10-19 18:30:58.035239745 +0200 *************** *** 0 **** --- 1 ---- + src/testdir/test42.in diff *** ../vim-8.1.2181/Filelist 2019-10-16 17:15:15.555232900 +0200 --- Filelist 2019-10-19 18:31:14.679173392 +0200 *************** *** 4,9 **** --- 4,10 ---- # source files for all source archives SRC_ALL = \ .gitignore \ + .gitattributes \ .hgignore \ .lgtm.yml \ .travis.yml \ *** ../vim-8.1.2181/src/testdir/test42.in 2010-05-15 13:04:10.000000000 +0200 --- src/testdir/test42.in 2019-10-19 18:34:42.014348638 +0200 *************** *** 2,7 **** --- 2,8 ---- STARTTEST :so mbyte.vim + :set cpoptions+=S :set encoding=utf-8 :set fileencodings=ucs-bom,latin-1 :set ff=unix ffs=unix " This changes the file for DOS and MAC *** ../vim-8.1.2181/src/version.c 2019-10-19 17:37:59.588282058 +0200 --- src/version.c 2019-10-19 18:36:46.561544463 +0200 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 2182, /**/ -- SECOND SOLDIER: It could be carried by an African swallow! FIRST SOLDIER: Oh yes! An African swallow maybe ... but not a European swallow. that's my point. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///