[vim] 01/03: Merge tag 'v7.4.1689' into debian/sid

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository vim.

commit ec9fa2024dd246493538984cdf906672eed58585
Merge: cf485aa 758535a
Author: James McCoy <jamessan at debian.org>
Date:   Wed Mar 30 20:06:55 2016 -0400

    Merge tag 'v7.4.1689' into debian/sid

 README.md                                     | 66 ++++++++++++++-------------
 README.txt                                    | 64 +++++++++++++++-----------
 runtime/doc/channel.txt                       |  5 +-
 runtime/doc/editing.txt                       |  4 +-
 runtime/doc/eval.txt                          | 22 ++++++++-
 runtime/doc/helphelp.txt                      |  6 ++-
 runtime/doc/os_beos.txt                       |  7 +--
 runtime/doc/repeat.txt                        |  4 +-
 runtime/doc/tags                              |  2 +
 runtime/doc/todo.txt                          | 35 +++++---------
 runtime/doc/usr_05.txt                        |  7 ++-
 runtime/doc/usr_25.txt                        | 10 ++--
 runtime/doc/usr_41.txt                        |  4 +-
 runtime/pack/dist/opt/matchit/doc/matchit.txt | 13 ++----
 runtime/syntax/sh.vim                         |  9 ++--
 runtime/syntax/tex.vim                        |  8 ++--
 src/channel.c                                 |  2 +-
 src/eval.c                                    | 55 ++++++++++++++++++++--
 src/if_mzsch.c                                | 25 ++++++++++
 src/if_ruby.c                                 | 36 ++++++++++-----
 src/testdir/runtest.vim                       |  4 +-
 src/testdir/test_alot.vim                     |  1 +
 src/testdir/test_backspace_opt.vim            |  2 +-
 src/testdir/test_channel.vim                  | 23 ++++++++++
 src/testdir/test_matchstrpos.vim              | 13 ++++++
 src/testdir/test_viminfo.vim                  |  2 +-
 src/version.c                                 | 12 +++++
 27 files changed, 304 insertions(+), 137 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/vim.git