Commit Graph

92 Commits

Author SHA1 Message Date
Douglas Drumond
ee3e52b75a Merge branch 'vim'
* vim: (310 commits)
  updated for version 7.4.622 Problem:    Compiler warning for unused argument. Solution:   Add UNUSED.
  updated for version 7.4.621 Problem:    Returning 1 in the wrong function. (Raymond Ko) Solution:   Return 1 in the right function (hopefully).
  updated for version 7.4.620 Problem:    Compiler warning for unitinialized variable. (Tony Mechelynck) Solution:   Initialize "did_free". (Ben Fritz)
  updated for version 7.4.619 Problem:    luaV_setref() not returning the correct value. Solution:   Return one.
  updated for version 7.4.618 Problem:    luaV_setref() is missing a return statement. (Ozaki Kiichi) Solution:   Put the return statement back.
  Update runtime files.
  updated for version 7.4.617 Problem:    Wrong ":argdo" range does not cause an error. Solution:   Reset "cmd" to NULL. (Marcin Szamotulski, Ingo Karkat)
  updated for version 7.4.616 Problem:    Cannot insert a tab in front of a block. Solution:   Correctly compute aop->start. (Christian Brabandt)
  updated for version 7.4.615 Problem:    Vim hangs when freeing a lot of objects. Solution:   Do not go back to the start of the list every time.  (Yasuhiro 	    Matsumoto and Ariya Mizutani)
  updated for version 7.4.614 Problem:    There is no test for what patch 7.4.601 fixes. Solution:   Add a test. (Christian Brabandt)
  updated for version 7.4.613 Problem:    The NFA engine does not implement the 'redrawtime' time limit. Solution:   Implement the time limit.
  updated for version 7.4.612 Problem:    test_eval fails on Mac. Solution:   Use the * register instead of the + register. (Jun Takimoto)
  updated for version 7.4.611 Problem:    Syntax error. Solution:   Change statement to return.
  updated for version 7.4.610 Problem:    Some function headers may be missing from generated .pro files. Solution:   Add PROTO to the #ifdef.
  updated for version 7.4.609 Problem:    For complicated list and dict use the garbage collector can run 	    out of stack space. Solution:   Use a stack of dicts and lists to be marked, thus making it 	    iterative instead of recursive. (Ben Fritz)
  updated for version 7.4.608 Problem:    test_eval fails when the clipboard feature is missing. Solution:   Skip part of the test. Reduce the text used.
  updated for version 7.4.607 Problem:    Compiler warnings for unused variables. Solution:   Move them inside #ifdef. (Kazunobu Kuriyama)
  updated for version 7.4.606 Problem:    May crash when using a small window. Solution:   Avoid dividing by zero. (Christian Brabandt)
  updated for version 7.4.605 Problem:    The # register is not writable, it cannot be restored after 	    jumping around. Solution:   Make the # register writable. (Marcin Szamotulski)
  updated for version 7.4.604 Problem:    Running tests changes viminfo. Solution:   Disable viminfo.
  ...

Signed-off-by: Douglas Drumond <drumond.douglas@gmail.com>
2015-02-23 06:55:31 -03:00
Bram Moolenaar
8fa10655c9 Updated runtime files. 2015-02-12 03:09:39 -02:00
Bram Moolenaar
57c1ff4f7d Updated syntax files. 2015-02-12 03:09:33 -02:00
Bjorn Winckler
98f6e2f5a3 Merge branch 'vim'
Conflicts:
	runtime/syntax/vim.vim
	src/structs.h
2014-04-20 10:22:02 +02:00
Bram Moolenaar
1986c3419e Updated runtime files. 2014-03-22 21:02:50 +01:00
Bjorn Winckler
90a2abe6f7 Merge branch 'vim' 2013-09-16 09:19:14 +02:00
Bram Moolenaar
9416bca31b Updated runtime files. 2013-09-05 22:13:31 +02:00
Bjorn Winckler
7aacbcd19f Merge branch 'vim' 2013-07-06 19:02:27 +02:00
Bram Moolenaar
9592d73105 A few updated runtime files. 2013-07-05 21:01:22 +02:00
Bjorn Winckler
3e20bda243 Merge branch 'vim'
Conflicts:
	src/auto/configure
	src/configure.in
	src/vim.h
2013-06-08 15:36:15 +02:00
Bram Moolenaar
e0086714bc Updated runtime files and translations. 2013-06-01 14:50:56 +02:00
Bjorn Winckler
11b2e90995 Merge branch 'vim'
Conflicts:
	runtime/syntax/vim.vim
	src/auto/configure
	src/eval.c
	src/if_ruby.c
	src/misc1.c
	src/normal.c
2013-05-18 16:18:54 +02:00
Bram Moolenaar
4c0f497180 Update runtime files. 2013-03-19 11:35:58 +01:00
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