Mercurial > vim
comparison src/version.c @ 7697:f04e2b6feea2 v7.4.1147
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jan 20 22:48:02 2016 +0100
patch 7.4.1147
Problem: Conflict for "chartab". (Kazunobu Kuriyama)
Solution: Rename the global one to something less obvious. Move it into
src/chartab.c.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 20 Jan 2016 23:00:12 +0100 |
| parents | a865f9773cb2 |
| children | 854302b82ff9 |
comparison
equal
deleted
inserted
replaced
| 7696:02d9590a8309 | 7697:f04e2b6feea2 |
|---|---|
| 739 NULL | 739 NULL |
| 740 }; | 740 }; |
| 741 | 741 |
| 742 static int included_patches[] = | 742 static int included_patches[] = |
| 743 { /* Add new patch number below this line */ | 743 { /* Add new patch number below this line */ |
| 744 /**/ | |
| 745 1147, | |
| 744 /**/ | 746 /**/ |
| 745 1146, | 747 1146, |
| 746 /**/ | 748 /**/ |
| 747 1145, | 749 1145, |
| 748 /**/ | 750 /**/ |