averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-02-09 20:26:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,216 Commits 5 Branches 171 Tags
caebe7d0746719e7dfd04f66c9fd43dfcb4d49b6
Commit Graph

79 Commits

Author SHA1 Message Date
Bjorn Winckler
caebe7d074 Merge branch 'vim' 
Conflicts:
	runtime/doc/various.txt
 2012-12-12 16:10:23 +01:00
Bram Moolenaar
cd5a832eb6 Updated runtime files. 2012-11-15 21:28:22 +01:00
Bjorn Winckler
35a06550f8 Merge branch 'vim' 
Conflicts:
	runtime/doc/tags
	src/auto/configure
	src/globals.h
 2012-07-17 22:17:12 +02:00
Bram Moolenaar
8cbbb57777 Updated runtime files. 2012-07-12 22:01:11 +02:00
Bjorn Winckler
a801156cbf Merge branch 'vim' 
Conflicts:
	runtime/doc/tags
	runtime/doc/various.txt
	src/auto/configure
 2012-02-24 15:46:35 +01:00
Bram Moolenaar
591d30c69f Update runtime files. 2012-01-20 21:08:56 +01:00
Bjorn Winckler
4fe710d0f9 Merge branch 'vim' 
Conflicts:
	runtime/syntax/vim.vim
 2011-09-22 17:37:28 +02:00
Bram Moolenaar
456ae485bf Updated a few runtime files. 2011-09-21 19:22:10 +02:00
Bjorn Winckler
f7f11165e3 Merge branch 'vim' 2011-04-21 11:07:30 +02:00
Bram Moolenaar
ce0253ed24 Updated runtime files. 2011-04-01 18:03:16 +02:00
Bjorn Winckler
34d035c0ac Merge branch 'vim' 
Conflicts:
	runtime/syntax/vim.vim
 2010-12-19 12:18:48 +01:00
Bram Moolenaar
f2c486c416 Update runtime files. 2010-12-10 20:35:50 +01:00
Bjorn Winckler
9787b377fa Merge branch 'vim73' into macvim73 
Conflicts:
	runtime/syntax/vim.vim
	src/screen.c
 2010-08-08 23:13:25 +02:00
Bram Moolenaar
203a46a890 Updated syntax files. (Charles Campbell) 
--HG--
branch : vim73
 2010-08-04 23:03:17 +02:00
Bjorn Winckler
e9de29bf9e Merge branch 'vim73' into macvim73 2010-08-04 19:23:39 +02:00
Bram Moolenaar
29caec46a7 Syntax file updates. (Charles Campbell) 
--HG--
branch : vim73
 2010-08-02 22:12:46 +02:00
Bjorn Winckler
5dcf4f9ffe Merge branch 'vim73' into macvim73 
Conflicts:
	runtime/syntax/vim.vim
	src/auto/configure
 2010-07-23 13:44:55 +02:00
Bram Moolenaar
8123df60d7 Updated sh and vim syntax files. (Charles Campbell) 
--HG--
branch : vim73
 2010-07-20 12:36:02 +02:00
Bjorn Winckler
12e6a57d52 Merge branch 'vim73' into macvim73 
Conflicts:
	src/auto/configure
	src/configure.in
	src/eval.c
 2010-07-18 18:03:55 +02:00
Bram Moolenaar
56361677b1 Added support for Python 3. (Roland Puntaier) 
--HG--
branch : vim73
 2010-07-17 21:19:38 +02:00
Bjorn Winckler
3877ec23cd Merge branch 'vim73' into macvim73 
Conflicts:
	runtime/syntax/vim.vim
	src/auto/configure
	src/configure.in
	src/feature.h
	src/globals.h
	src/gui.c
	src/gui.h
	src/mbyte.c
	src/option.c
	src/option.h
	src/screen.c
 2010-07-05 22:11:19 +02:00
Bram Moolenaar
1632064821 Make updating text for conceal mode simpler. A few compiler warning fixes. 
--HG--
branch : vim73
 2010-07-02 20:20:09 +02:00
Bjorn Winckler
e8125bcdff Merge upstream/hg/vim73 into macvim73 
Conflicts:
	runtime/doc/eval.txt
	runtime/syntax/vim.vim
	src/Makefile
	src/auto/configure
	src/feature.h
	src/netbeans.c
	src/proto/netbeans.pro
	src/structs.h
 2010-05-30 18:33:05 +02:00
Bjorn Winckler
7fb78f10c9 Regenerate help tags and update vim syntax file 
To avoid problems during the move to use the Mercurial repository the
help tags and syntax/vim.vim file were not updated.  This commit
(re-)adds all MacVim specific options and commands to vim.vim and
regenerates the help tags.
 2010-05-29 18:19:54 +02:00
Bram Moolenaar
14290793f2 Add 'relativenumber' patch from Markus Heidelberg. 
--HG--
branch : vim73
 2010-05-16 15:46:46 +02:00
Bram Moolenaar
4895774ca7 Update runtime files. 2010-01-06 20:54:52 +01:00
vimboss
ebb92ddd72 updated for version 7.2c-000 2008-08-06 17:06:04 +00:00
vimboss
7a75fec5ca updated for version 7.2b-000 2008-07-13 17:41:49 +00:00
vimboss
490fa97722 updated for version 7.2a 2008-06-24 21:16:56 +00:00
vimboss
cc8688d998 updated for version 7.1 2007-05-12 13:36:14 +00:00
vimboss
d0451cbcb9 updated for version 7.1b 2007-05-10 17:24:16 +00:00
vimboss
0496d46ee2 updated for version 7.1a 2007-05-05 17:54:07 +00:00
vimboss
938b339827 updated for version 7.0g01 2006-05-02 22:08:30 +00:00
vimboss
a7081a05c4 updated for version 7.0f03 2006-04-27 21:40:34 +00:00
vimboss
2372438f62 updated for version 7.0f02 2006-04-27 00:02:13 +00:00
vimboss
2d1be1e482 updated for version 7.0f01 2006-04-25 22:13:59 +00:00
vimboss
a964e97586 updated for version 7.0e03 2006-04-19 21:23:36 +00:00
vimboss
a724a19897 updated for version 7.0e02 2006-04-18 21:55:01 +00:00
vimboss
6660b6ef2d updated for version 7.0e01 2006-04-17 22:14:47 +00:00
vimboss
27f68e676c updated for version 7.0d02 2006-04-12 21:52:12 +00:00
vimboss
9f43c236b9 updated for version 7.0c10 2006-04-05 20:41:53 +00:00
vimboss
7dd92ca62c updated for version 7.0c03 2006-03-29 21:18:24 +00:00
vimboss
4dbdfbd0cb updated for version 7.0232 2006-03-23 22:47:08 +00:00
vimboss
33fd289021 updated for version 7.0230 2006-03-20 21:47:49 +00:00
vimboss
c652aea537 updated for version 7.0226 2006-03-16 21:35:52 +00:00
vimboss
90eb26272b updated for version 7.0224 2006-03-14 22:55:34 +00:00
vimboss
ae41e146d6 updated for version 7.0218 2006-03-08 21:32:40 +00:00
vimboss
050845c659 updated for version 7.0213 2006-03-03 22:50:42 +00:00
vimboss
87af0d09cd updated for version 7.0207 2006-02-25 21:47:41 +00:00
vimboss
9d3239931c updated for version 7.0205 2006-02-23 21:26:58 +00:00