[vim] 03/05: Merge tag 'v7.4.2295' into debian/sid

James McCoy jamessan at debian.org
Wed Aug 31 04:00:39 UTC 2016


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

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

commit d469a5fc68611c1816c1e04236d2d583a0b711cd
Merge: c86d5ff 4792255
Author: James McCoy <jamessan at debian.org>
Date:   Tue Aug 30 21:27:08 2016 -0400

    Merge tag 'v7.4.2295' into debian/sid

 Filelist                                         |    4 +
 Makefile                                         |  109 +-
 nsis/gvim.nsi                                    |    1 +
 runtime/defaults.vim                             |   14 +-
 runtime/doc/channel.txt                          |   19 +-
 runtime/doc/cmdline.txt                          |   16 +-
 runtime/doc/diff.txt                             |    8 +-
 runtime/doc/editing.txt                          |   12 +-
 runtime/doc/eval.txt                             |  616 ++--
 runtime/doc/gui_x11.txt                          |   66 +-
 runtime/doc/index.txt                            |    9 +-
 runtime/doc/map.txt                              |    9 +-
 runtime/doc/options.txt                          |   99 +-
 runtime/doc/quickref.txt                         |    5 +-
 runtime/doc/sign.txt                             |   14 +-
 runtime/doc/starting.txt                         |   39 +-
 runtime/doc/syntax.txt                           |   17 +-
 runtime/doc/tabpage.txt                          |   24 +-
 runtime/doc/tags                                 |   55 +-
 runtime/doc/tagsrch.txt                          |   78 +-
 runtime/doc/todo.txt                             |  135 +-
 runtime/doc/usr_41.txt                           |    8 +-
 runtime/doc/various.txt                          |   25 +-
 runtime/doc/version7.txt                         |    2 +-
 runtime/doc/version8.txt                         | 1589 ++++++++-
 runtime/doc/vi_diff.txt                          |   16 +-
 runtime/doc/vim.man                              |    2 +-
 runtime/doc/windows.txt                          |    8 +-
 runtime/filetype.vim                             |   16 +-
 runtime/ftplugin/rmd.vim                         |   16 +-
 runtime/ftplugin/scala.vim                       |   37 +
 runtime/indent/fortran.vim                       |   10 +-
 runtime/indent/javascript.vim                    |  196 +-
 runtime/indent/rnoweb.vim                        |   14 +-
 runtime/indent/scala.vim                         |  609 ++++
 runtime/indent/teraterm.vim                      |   10 +-
 runtime/indent/yaml.vim                          |   35 +-
 runtime/keymap/pinyin.vim                        |    2 +-
 runtime/keymap/russian-jcukenmac.vim             |   94 +
 runtime/optwin.vim                               |   11 +-
 runtime/pack/dist/opt/matchit/plugin/matchit.vim |   23 +-
 runtime/synmenu.vim                              |   52 +-
 runtime/syntax/dockerfile.vim                    |    8 +-
 runtime/syntax/fortran.vim                       |   34 +-
 runtime/syntax/muttrc.vim                        |  358 +--
 runtime/syntax/python.vim                        |   31 +-
 runtime/syntax/r.vim                             |    6 +-
 runtime/syntax/rhelp.vim                         |    3 +-
 runtime/syntax/rmd.vim                           |    4 +-
 runtime/syntax/rrst.vim                          |    4 +-
 runtime/syntax/rst.vim                           |   14 +-
 runtime/syntax/scala.vim                         |  231 ++
 runtime/syntax/sh.vim                            |   48 +-
 runtime/syntax/sshconfig.vim                     |    6 +-
 runtime/syntax/teraterm.vim                      |    6 +-
 runtime/syntax/vim.vim                           |   44 +-
 runtime/tutor/tutor.es                           |    2 +-
 runtime/tutor/tutor.es.utf-8                     |    2 +-
 src/Makefile                                     |   45 +-
 src/alloc.h                                      |    2 +-
 src/arabic.c                                     |    2 +-
 src/arabic.h                                     |    2 +-
 src/ascii.h                                      |    2 +-
 src/auto/configure                               |    2 +-
 src/blowfish.c                                   |    2 +-
 src/buffer.c                                     |  143 +-
 src/channel.c                                    |   26 +-
 src/charset.c                                    |    2 +-
 src/configure.in                                 |    2 +-
 src/crypt.c                                      |    2 +-
 src/crypt_zip.c                                  |    2 +-
 src/dict.c                                       |   26 +-
 src/diff.c                                       |   17 +-
 src/digraph.c                                    |    2 +-
 src/dosinst.c                                    |    2 +-
 src/dosinst.h                                    |    2 +-
 src/edit.c                                       |   10 +-
 src/eval.c                                       |   90 +-
 src/evalfunc.c                                   |  462 ++-
 src/ex_cmds.c                                    |  278 +-
 src/ex_cmds.h                                    |    5 +-
 src/ex_cmds2.c                                   |    2 +-
 src/ex_docmd.c                                   |   68 +-
 src/ex_eval.c                                    |    2 +-
 src/ex_getln.c                                   |  172 +-
 src/farsi.c                                      |    2 +-
 src/farsi.h                                      |    2 +-
 src/feature.h                                    |    2 +-
 src/fileio.c                                     |   24 +-
 src/fold.c                                       |    2 +-
 src/getchar.c                                    |   45 +-
 src/glbl_ime.cpp                                 |    2 +-
 src/glbl_ime.h                                   |    2 +-
 src/globals.h                                    |    8 +-
 src/gui.c                                        |   11 +-
 src/gui.h                                        |    4 +-
 src/gui_at_fs.c                                  |    2 +-
 src/gui_at_sb.c                                  |    2 +-
 src/gui_at_sb.h                                  |    2 +-
 src/gui_athena.c                                 |    2 +-
 src/gui_beval.c                                  |    2 +-
 src/gui_beval.h                                  |    2 +-
 src/gui_gtk.c                                    |    2 +-
 src/gui_gtk_f.c                                  |    2 +-
 src/gui_gtk_f.h                                  |    2 +-
 src/gui_gtk_vms.h                                |    2 +-
 src/gui_gtk_x11.c                                |   42 +-
 src/gui_mac.c                                    |    8 +-
 src/gui_motif.c                                  |    2 +-
 src/gui_photon.c                                 |    7 +-
 src/gui_w32.c                                    |   23 +-
 src/gui_x11.c                                    |    8 +-
 src/gui_x11_pm.h                                 |    2 +-
 src/gui_xmdlg.c                                  |    2 +-
 src/gui_xmebw.c                                  |    2 +-
 src/gui_xmebw.h                                  |    2 +-
 src/gui_xmebwp.h                                 |    2 +-
 src/hangulin.c                                   |    2 +-
 src/hardcopy.c                                   |    2 +-
 src/hashtab.c                                    |    2 +-
 src/if_cscope.c                                  |    2 +-
 src/if_cscope.h                                  |   13 +-
 src/if_lua.c                                     |    5 +-
 src/if_mzsch.c                                   |   27 +-
 src/if_mzsch.h                                   |    7 +-
 src/if_ole.cpp                                   |    2 +-
 src/if_perl.xs                                   |    2 +-
 src/if_perlsfio.c                                |    2 +-
 src/if_py_both.h                                 |    4 +-
 src/if_python3.c                                 |    2 +-
 src/if_ruby.c                                    |    2 +-
 src/if_tcl.c                                     |    2 +-
 src/if_xcmdsrv.c                                 |    2 +-
 src/integration.c                                |    2 +-
 src/integration.h                                |    2 +-
 src/iscygpty.c                                   |    2 +-
 src/json.c                                       |   37 +-
 src/json_test.c                                  |    2 +-
 src/keymap.h                                     |    2 +-
 src/list.c                                       |    2 +-
 src/macros.h                                     |    9 +-
 src/main.c                                       |    4 +-
 src/mark.c                                       |    2 +-
 src/mbyte.c                                      |    2 +-
 src/memfile.c                                    |    2 +-
 src/memfile_test.c                               |    2 +-
 src/memline.c                                    |    2 +-
 src/menu.c                                       |    2 +-
 src/message.c                                    |  204 +-
 src/message_test.c                               |    2 +-
 src/misc1.c                                      |   42 +-
 src/misc2.c                                      |   36 +-
 src/move.c                                       |    9 +-
 src/nbdebug.c                                    |    2 +-
 src/nbdebug.h                                    |    2 +-
 src/netbeans.c                                   |    2 +-
 src/normal.c                                     |    2 +-
 src/ops.c                                        |    4 +-
 src/option.c                                     |  124 +-
 src/option.h                                     |   15 +-
 src/os_amiga.c                                   |    4 +-
 src/os_amiga.h                                   |    2 +-
 src/os_beos.c                                    |    2 +-
 src/os_beos.h                                    |    2 +-
 src/os_dos.h                                     |    2 +-
 src/os_mac.h                                     |    2 +-
 src/os_mac_conv.c                                |    4 +-
 src/os_macosx.m                                  |    2 +-
 src/os_mint.h                                    |    2 +-
 src/os_mswin.c                                   |    2 +-
 src/os_qnx.c                                     |    2 +-
 src/os_qnx.h                                     |    2 +-
 src/os_unix.c                                    |   25 +-
 src/os_unix.h                                    |    2 +-
 src/os_unixx.h                                   |    2 +-
 src/os_vms.c                                     |    2 +-
 src/os_w32dll.c                                  |    2 +-
 src/os_w32exe.c                                  |    2 +-
 src/os_win32.c                                   |    9 +-
 src/os_win32.h                                   |    2 +-
 src/po/check.vim                                 |   76 +-
 src/po/eo.po                                     |  827 ++---
 src/po/fi.po                                     | 3725 ++++++++++++----------
 src/po/fr.po                                     |  869 ++---
 src/popupmnu.c                                   |    2 +-
 src/proto.h                                      |    2 +-
 src/proto/dict.pro                               |    1 +
 src/proto/eval.pro                               |    1 -
 src/proto/ex_cmds.pro                            |    2 +
 src/proto/fileio.pro                             |    3 +-
 src/proto/getchar.pro                            |    2 +-
 src/proto/gui.pro                                |    2 +-
 src/proto/gui_gtk_x11.pro                        |    4 +-
 src/proto/gui_mac.pro                            |    2 +-
 src/proto/gui_photon.pro                         |    2 +-
 src/proto/gui_w32.pro                            |    3 +-
 src/proto/gui_x11.pro                            |    4 +-
 src/proto/main.pro                               |    3 +-
 src/proto/mbyte.pro                              |    2 +-
 src/proto/message.pro                            |    3 +-
 src/proto/misc2.pro                              |    4 +-
 src/proto/normal.pro                             |    2 +-
 src/proto/ops.pro                                |    2 +-
 src/proto/option.pro                             |    2 +
 src/proto/quickfix.pro                           |    6 +-
 src/proto/search.pro                             |    1 +
 src/proto/term.pro                               |    6 +-
 src/proto/window.pro                             |    3 +
 src/pty.c                                        |    2 +-
 src/quickfix.c                                   |  275 +-
 src/regexp.c                                     |    2 +-
 src/regexp.h                                     |    2 +-
 src/regexp_nfa.c                                 |    2 +-
 src/screen.c                                     |   89 +-
 src/search.c                                     |   15 +-
 src/sha256.c                                     |    2 +-
 src/spell.c                                      |   26 +-
 src/spell.h                                      |    2 +-
 src/spellfile.c                                  |    2 +-
 src/structs.h                                    |   24 +-
 src/syntax.c                                     |   15 +-
 src/tag.c                                        |   15 +-
 src/term.c                                       |   53 +-
 src/term.h                                       |    2 +-
 src/termlib.c                                    |    2 +-
 src/testdir/Make_all.mak                         |    8 +-
 src/testdir/README.txt                           |    5 +-
 src/testdir/runtest.vim                          |   11 +-
 src/testdir/shared.vim                           |   20 +-
 src/testdir/test62.in                            |  205 --
 src/testdir/test62.ok                            |   95 -
 src/testdir/test_alot.vim                        |    4 +
 src/testdir/test_alot_utf8.vim                   |    1 +
 src/testdir/test_backspace_opt.vim               |    2 +-
 src/testdir/test_bufwintabinfo.vim               |  103 +
 src/testdir/test_channel.py                      |    6 +-
 src/testdir/test_channel.vim                     |   63 +-
 src/testdir/test_cmdline.vim                     |   13 +
 src/testdir/test_cscope.vim                      |    7 +-
 src/testdir/test_diffmode.vim                    |   16 +
 src/testdir/test_digraph.vim                     |    2 +-
 src/testdir/test_expr.vim                        |  255 ++
 src/testdir/test_filter_cmd.vim                  |   54 +
 src/testdir/test_glob2regpat.vim                 |   20 +
 src/testdir/test_gn.vim                          |    2 +-
 src/testdir/test_gui.vim                         |    8 +
 src/testdir/test_help_tagjump.vim                |    2 +-
 src/testdir/test_increment.vim                   |    2 +-
 src/testdir/test_increment_dbcs.vim              |    2 +-
 src/testdir/test_mapping.in                      |   72 -
 src/testdir/test_mapping.ok                      |   22 -
 src/testdir/test_mapping.vim                     |  152 +
 src/testdir/test_match.vim                       |   55 +-
 src/testdir/test_netbeans.vim                    |    2 +-
 src/testdir/test_options.vim                     |   14 +-
 src/testdir/test_partial.vim                     |    9 +-
 src/testdir/test_popup.vim                       |   11 +-
 src/testdir/test_quickfix.vim                    |   49 +
 src/testdir/test_regexp_latin.vim                |    8 +
 src/testdir/test_regexp_utf8.vim                 |    4 +
 src/testdir/test_search.vim                      |  242 ++
 src/testdir/test_signs.in                        |   22 -
 src/testdir/test_signs.ok                        |    2 -
 src/testdir/test_signs.vim                       |  199 ++
 src/testdir/test_source_utf8.vim                 |   33 +
 src/testdir/test_startup.vim                     |   11 +-
 src/testdir/test_startup_utf8.vim                |   64 +
 src/testdir/test_tabpage.vim                     |  221 ++
 src/testdir/test_tagcase.in                      |   57 -
 src/testdir/test_tagcase.ok                      |   76 -
 src/testdir/test_tagcase.vim                     |   73 +
 src/testdir/test_tagjump.vim                     |   18 +-
 src/testdir/test_timers.vim                      |   26 +-
 src/testdir/test_viminfo.vim                     |   68 +
 src/testdir/test_window_cmd.vim                  |    2 +-
 src/ui.c                                         |    2 +-
 src/undo.c                                       |    2 +-
 src/uninstal.c                                   |    2 +-
 src/userfunc.c                                   |   63 +-
 src/version.c                                    |  258 +-
 src/version.h                                    |    2 +-
 src/vim.h                                        |   36 +-
 src/vim.rc                                       |    2 +-
 src/vimio.h                                      |    2 +-
 src/vimrun.c                                     |   69 +-
 src/winclip.c                                    |    2 +-
 src/window.c                                     |   60 +-
 src/workshop.c                                   |    2 +-
 src/workshop.h                                   |    2 +-
 src/wsdebug.c                                    |    2 +-
 src/wsdebug.h                                    |    2 +-
 src/xpm_w32.c                                    |    2 +-
 tools/rename.bat                                 |    6 +
 293 files changed, 11263 insertions(+), 4953 deletions(-)

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



More information about the pkg-vim-maintainers mailing list