Commit Graph

290 Commits

Author SHA1 Message Date
Bjorn Winckler 00936cdd77 Merge branch 'vim'
Conflicts:
	runtime/doc/eval.txt
2011-01-09 16:16:35 +01:00
Bram Moolenaar fa35c64041 Updated runtime files. 2011-01-08 16:06:37 +01: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 29697da99f Merge branch 'vim' into merge
Conflicts:
	src/auto/configure
	src/eval.c
	src/netbeans.c
2010-12-10 19:13:58 +01:00
Bram Moolenaar 96d70531dd Updated runtime files. 2010-11-16 20:34:40 +01:00
Bjorn Winckler 5c71a17d6c Merge branch 'vim'
Conflicts:
	src/auto/configure
2010-11-01 13:39:23 +01:00
Bram Moolenaar 65cb201df3 Updated runtile files. 2010-10-27 18:34:44 +02:00
Bram Moolenaar 679e2d9461 Updated runtime files and translations. 2010-10-20 18:45:33 +02:00
Bjorn Winckler 051dd87d5e Merge branch 'vim'
Conflicts:
	src/main.c
2010-10-01 16:55:17 +02:00
Bram Moolenaar 8d49009628 Runtime file updates. 2010-09-30 21:47:56 +02:00
Bram Moolenaar 3a7b73bbe8 Updated runtime files. 2010-09-21 22:34:02 +02:00
Bram Moolenaar 7e9a35b73e Updated runtime files. 2010-09-19 19:01:21 +02:00
Bjorn Winckler 34604f8552 Merge branch 'vim73' into macvim73
Conflicts:
	src/auto/configure
2010-08-14 20:55:23 +02:00
Bram Moolenaar cd6dedcacc Fix for Yaml syntax file. (Nikolai Weibull)
--HG--
branch : vim73
2010-08-13 14:58:53 +02:00
Bram Moolenaar d341131f60 Runtime file updates.
--HG--
branch : vim73
2010-08-13 14:38:12 +02:00
Bram Moolenaar 1d86870323 Update to Perl runtime files. (Andy Lester)
--HG--
branch : vim73
2010-08-13 12:09:22 +02:00
Bram Moolenaar fc88796a54 Updates for :TOhtml. (Benjamin Fritz)
--HG--
branch : vim73
2010-08-13 11:30:02 +02:00
Bram Moolenaar f166b809bc Runtime file updates.
--HG--
branch : vim73
2010-08-11 23:37:32 +02:00
Bram Moolenaar 05246bf32e Runtime file updates. Fix tar plugin window split.
--HG--
branch : vim73
2010-08-10 21:43:35 +02:00
Bram Moolenaar b6a0fcfb5d Runtime file updates.
--HG--
branch : vim73
2010-08-09 22:33:06 +02:00
Bram Moolenaar c263388a1f Runtime file updates. (Tim Pope)
--HG--
branch : vim73
2010-08-09 20:13:35 +02: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 9a96d5dc0c Also support Doxygen in C# files. (Andreas J. Beblik)
--HG--
branch : vim73
2010-08-08 15:28:22 +02:00
Bram Moolenaar e8219a043c Updates for :TOhtml. (Ben Fritz)
--HG--
branch : vim73
2010-08-07 15:47:30 +02:00
Bram Moolenaar bd16010c08 Update for jsp syntax file.
--HG--
branch : vim73
2010-08-07 13:46:23 +02:00
Bram Moolenaar d436e625c9 Updated syntax files.
--HG--
branch : vim73
2010-08-05 22:08:47 +02:00
Bram Moolenaar 6b904597ff Improve handling of user settings in :TOhtml. Default to generating CSS.
(Benjamin Fritz)

--HG--
branch : vim73
2010-08-05 21:54:00 +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 6aca8a785d Add translations in diff syntax. (Jakson A. Aquino)
--HG--
branch : vim73
2010-08-04 16:11:50 +02:00
Bram Moolenaar d8ac2e3d0f Runtime file updates.
--HG--
branch : vim73
2010-08-03 23:00:38 +02:00
Bram Moolenaar 29caec46a7 Syntax file updates. (Charles Campbell)
--HG--
branch : vim73
2010-08-02 22:12:46 +02:00
Bram Moolenaar 650770be1e Add Datascript syntax file. (Dominique Pelle)
--HG--
branch : vim73
2010-08-01 21:48:21 +02:00
Bjorn Winckler 7a742084e2 Merge branch 'vim73' into macvim73
Conflicts:
	src/normal.c
	src/vim.h
2010-08-01 20:55:44 +02:00
Bram Moolenaar b33a4e633d Updated runtime files. :TOhtml improvements by Benjamin Fritz.
--HG--
branch : vim73
2010-07-29 20:43:36 +02:00
Bram Moolenaar 98f89366d7 More accented characters in tex.vim syntax. (Charles Campbell)
--HG--
branch : vim73
2010-07-28 17:25:21 +02:00
Bram Moolenaar 8a34e48829 Minor runtime file updates.
--HG--
branch : vim73
2010-07-28 12:52:27 +02:00
Bram Moolenaar 60943f173f Update TeX syntax file.
--HG--
branch : vim73
2010-07-26 22:51:56 +02:00
Bram Moolenaar 919a34d10a Updated runtime files.
--HG--
branch : vim73
2010-07-26 22:21:27 +02:00
Bjorn Winckler 73972981a6 Merge branch 'vim73' into macvim73
Conflicts:
	src/auto/configure
	src/configure.in
	src/normal.c
2010-07-25 23:09:00 +02:00
Bram Moolenaar db79a140c6 Add the synconcealed() function and use it for :TOhtml. (Benjamin Fritz)
--HG--
branch : vim73
2010-07-25 12:46:44 +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 9b74bcb368 Update Fortran indent and syntax file. (Ajit Thakkar)
--HG--
branch : vim73
2010-07-22 22:30:23 +02:00
Bram Moolenaar 6a480b9930 Make it possible to load Perl dynamically on Unix. (James Vega)
--HG--
branch : vim73
2010-07-21 22:05:20 +02:00
Bram Moolenaar 8123df60d7 Updated sh and vim syntax files. (Charles Campbell)
--HG--
branch : vim73
2010-07-20 12:36:02 +02:00
Bram Moolenaar 187a813f3f Vim 7.3a -> 7.3b.
--HG--
branch : vim73
2010-07-18 23:29:58 +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 8eec834325 Better conceal in help. (partly by Dominique Pelle)
--HG--
branch : vim73
2010-07-18 14:34:51 +02:00
Bram Moolenaar d7e673e0d2 Improved :TOhtml. (Benjamin Fritz)
--HG--
branch : vim73
2010-07-18 14:07:22 +02:00