diff options
| -rw-r--r-- | .gitignore | 20 | ||||
| -rw-r--r-- | .hgignore | 104 | ||||
| -rw-r--r-- | Filelist | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 123 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 85e482d1f..5767bae79 100644 --- a/.gitignore +++ b/.gitignore @@ -6,16 +6,15 @@ src/auto/if_perl.c src/auto/gui_gtk_gresources.c src/auto/gui_gtk_gresources.h src/objects/.dirstamp +src/objects src/tags # We do need src/auto/configure. -src/auto/config.aap src/auto/config.cache src/auto/config.h src/auto/config.log src/auto/config.mk src/auto/config.status -src/auto/configure.aap src/auto/osdef.h src/auto/link.log src/auto/link.sed @@ -26,6 +25,7 @@ src/auto/pathdef.c *.idb *.manifest *.exp +*.map *.obj *.pdb *.ilk @@ -35,13 +35,13 @@ src/auto/pathdef.c *.RES vim*.dll vim*.lib -src/if_perl.c src/pathdef.c src/Obj*/pathdef.c gvimext.dll gvimext.lib gvim.lib runtime/doc/uganda.nsis.txt +nsis/icons/* # Borland C++ bcc.cfg @@ -49,7 +49,6 @@ bcc.cfg *.ild *.ilf *.ils -*.map *.tds # NetBeans @@ -88,3 +87,16 @@ src/memfile_test src/json_test src/message_test src/kword_test + +# Generated by "make install" +runtime/doc/tags + +# Generated by "make shadow". The directory names could be anything but we +# restrict them to shadow (the default) or shadow-* +src/shadow +src/shadow-* +src/runtime +src/pixmaps + +# other possible files build by tools +src/cscope.out diff --git a/.hgignore b/.hgignore new file mode 100644 index 000000000..8b5c5eda2 --- /dev/null +++ b/.hgignore @@ -0,0 +1,104 @@ +syntax: glob + +# Unixen: object and executable files. +*.o +src/vim +src/xxd/xxd +src/auto/if_perl.c +src/auto/gui_gtk_gresources.c +src/auto/gui_gtk_gresources.h +src/objects/.dirstamp +src/objects +src/tags + +# We do need src/auto/configure. +src/auto/config.cache +src/auto/config.h +src/auto/config.log +src/auto/config.mk +src/auto/config.status +src/auto/osdef.h +src/auto/link.log +src/auto/link.sed +src/auto/pathdef.c + +# Windows +*.exe +*.idb +*.manifest +*.exp +*.map +*.obj +*.pdb +*.ilk +*.sln +*.suo +*.res +*.RES +vim*.dll +vim*.lib +src/pathdef.c +src/Obj*/pathdef.c +gvimext.dll +gvimext.lib +gvim.lib +runtime/doc/uganda.nsis.txt +nsis/icons/* + +# Borland C++ +bcc.cfg +*.ilc +*.ild +*.ilf +*.ils +*.tds + +# NetBeans +nbproject/* + +# Mac OSX +src/xxd/xxd.dSYM + +# All platforms +*.rej +*.orig +*.mo +*.swp +*~ +*.pyc +*.log +src/po/vim.pot + +# Generated by "make test" +src/po/*.ck +src/po/*.desktop +src/testdir/mbyte.vim +src/testdir/mzscheme.vim +src/testdir/lua.vim +src/testdir/small.vim +src/testdir/tiny.vim +src/testdir/test*.out +src/testdir/test*.failed +src/testdir/test.log +src/testdir/dostmp/* +src/testdir/messages +src/testdir/viminfo +src/testdir/opt_test.vim +runtime/indent/testdir/*.out +src/memfile_test +src/json_test +src/message_test +src/kword_test + +# Generated by "make install" +runtime/doc/tags + +# Generated by "make shadow". The directory names could be anything but we +# restrict them to shadow (the default) or shadow-* +src/shadow +src/shadow-* +src/runtime +src/pixmaps + +# other possible files build by tools +src/cscope.out @@ -3,6 +3,7 @@ # source files for all source archives SRC_ALL = \ + .gitignore \ .hgignore \ .lgtm.yml \ .travis.yml \ diff --git a/src/version.c b/src/version.c index 99bfb9821..676c38306 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1290, +/**/ 1289, /**/ 1288, |