projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 5f6937f1 AM |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.112 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=ISO-8859-1 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 6.2.112 | |
| 11 | Problem: After applying patches test32 fails. (Antonio Colombo) | |
| 12 | Solution: Have "make clean" in the testdir delete *.rej and *.orig files. | |
| 13 | Use this when doing "make clean" in the src directory. | |
| 14 | Files: src/Makefile, src/testdir/Makefile | |
| 15 | ||
| 16 | ||
| 17 | *** ../vim-6.2.111/src/Makefile Wed Sep 10 21:51:27 2003 | |
| 18 | --- src/Makefile Mon Sep 22 19:22:52 2003 | |
| 19 | *************** | |
| 20 | *** 1562,1568 **** | |
| 21 | cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) | |
| 22 | ||
| 23 | testclean: | |
| 24 | ! -rm -f testdir/*.out testdir/test.log | |
| 25 | ||
| 26 | # | |
| 27 | # Avoid overwriting an existing executable, somebody might be running it and | |
| 28 | --- 1587,1593 ---- | |
| 29 | cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) | |
| 30 | ||
| 31 | testclean: | |
| 32 | ! cd testdir; $(MAKE) -f Makefile clean | |
| 33 | ||
| 34 | # | |
| 35 | # Avoid overwriting an existing executable, somebody might be running it and | |
| 36 | *** ../vim-6.2.111/src/testdir/Makefile Fri Apr 18 17:14:03 2003 | |
| 37 | --- src/testdir/Makefile Wed Oct 8 19:59:05 2003 | |
| 38 | *************** | |
| 39 | *** 32,41 **** | |
| 40 | $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) | |
| 41 | ||
| 42 | clean: | |
| 43 | ! -rm -rf *.out test.log tiny.vim small.vim mbyte.vim test.ok X* | |
| 44 | ||
| 45 | test1.out: test1.in | |
| 46 | ! -rm -f $*.failed tiny.vim small.vim mbyte.vim | |
| 47 | $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in | |
| 48 | @/bin/sh -c "if diff test.out $*.ok; \ | |
| 49 | then mv -f test.out $*.out; \ | |
| 50 | --- 32,41 ---- | |
| 51 | $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG) | |
| 52 | ||
| 53 | clean: | |
| 54 | ! -rm -rf *.out *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* | |
| 55 | ||
| 56 | test1.out: test1.in | |
| 57 | ! -rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* | |
| 58 | $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in | |
| 59 | @/bin/sh -c "if diff test.out $*.ok; \ | |
| 60 | then mv -f test.out $*.out; \ | |
| 61 | *************** | |
| 62 | *** 45,51 **** | |
| 63 | -rm -rf X* | |
| 64 | ||
| 65 | .in.out: | |
| 66 | ! -rm -f $*.failed test.ok | |
| 67 | cp $*.ok test.ok | |
| 68 | $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in | |
| 69 | @/bin/sh -c "if diff test.out $*.ok; \ | |
| 70 | --- 45,51 ---- | |
| 71 | -rm -rf X* | |
| 72 | ||
| 73 | .in.out: | |
| 74 | ! -rm -f $*.failed test.ok X* | |
| 75 | cp $*.ok test.ok | |
| 76 | $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in | |
| 77 | @/bin/sh -c "if diff test.out $*.ok; \ | |
| 78 | *** ../vim-6.2.111/src/version.c Sun Oct 12 17:02:40 2003 | |
| 79 | --- src/version.c Sun Oct 12 17:04:08 2003 | |
| 80 | *************** | |
| 81 | *** 639,640 **** | |
| 82 | --- 639,642 ---- | |
| 83 | { /* Add new patch number below this line */ | |
| 84 | + /**/ | |
| 85 | + 112, | |
| 86 | /**/ | |
| 87 | ||
| 88 | -- | |
| 89 | hundred-and-one symptoms of being an internet addict: | |
| 90 | 176. You lie, even to user-friends, about how long you were online yesterday. | |
| 91 | ||
| 92 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 93 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 94 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 95 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |