projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| c6060300 MT |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.496 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.3.496 | |
| 11 | Problem: MS-DOS: When "diff" trips over difference in line separators some | |
| 12 | tests fail. | |
| 13 | Solution: Make some .ok files use unix line separators. (David Pope) | |
| 14 | Files: src/testdir/Make_dos.mak, src/testdir/Make_ming.mak | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-7.3.495/src/testdir/Make_dos.mak 2012-04-05 16:56:38.000000000 +0200 | |
| 18 | --- src/testdir/Make_dos.mak 2012-04-09 21:23:43.000000000 +0200 | |
| 19 | *************** | |
| 20 | *** 52,58 **** | |
| 21 | ||
| 22 | fixff: | |
| 23 | -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok | |
| 24 | ! -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q dotest.in | |
| 25 | ||
| 26 | clean: | |
| 27 | -del *.out | |
| 28 | --- 52,59 ---- | |
| 29 | ||
| 30 | fixff: | |
| 31 | -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok | |
| 32 | ! -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ | |
| 33 | ! dotest.in test60.ok test71.ok test74.ok | |
| 34 | ||
| 35 | clean: | |
| 36 | -del *.out | |
| 37 | *** ../vim-7.3.495/src/testdir/Make_ming.mak 2012-04-05 16:56:38.000000000 +0200 | |
| 38 | --- src/testdir/Make_ming.mak 2012-04-09 21:25:55.000000000 +0200 | |
| 39 | *************** | |
| 40 | *** 75,80 **** | |
| 41 | --- 75,82 ---- | |
| 42 | ||
| 43 | fixff: | |
| 44 | -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok | |
| 45 | + -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ | |
| 46 | + dotest.in test60.ok test71.ok test74.ok | |
| 47 | ||
| 48 | clean: | |
| 49 | -$(DEL) *.out | |
| 50 | *** ../vim-7.3.495/src/version.c 2012-04-09 20:42:20.000000000 +0200 | |
| 51 | --- src/version.c 2012-04-13 19:10:04.000000000 +0200 | |
| 52 | *************** | |
| 53 | *** 716,717 **** | |
| 54 | --- 716,719 ---- | |
| 55 | { /* Add new patch number below this line */ | |
| 56 | + /**/ | |
| 57 | + 496, | |
| 58 | /**/ | |
| 59 | ||
| 60 | -- | |
| 61 | There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU, | |
| 62 | Linux, etc, and those who know COBOL. It gets very difficult for me at | |
| 63 | parties, not knowing which group to socialise with :-) | |
| 64 | Sitaram Chamarty | |
| 65 | ||
| 66 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 67 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 68 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 69 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |