[vim] 01/03: Merge branch 'debian/experimental' into debian/sid

James McCoy jamessan at debian.org
Sun Aug 13 02:26:01 UTC 2017


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

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

commit c0cb7474dd04ee6f8b5cd6574d459346e0ac7e4f
Merge: dbe2eec bdb2a39
Author: James McCoy <jamessan at debian.org>
Date:   Sat Aug 12 21:44:46 2017 -0400

    Merge branch 'debian/experimental' into debian/sid
    
    Signed-off-by: James McCoy <jamessan at debian.org>

 .gitignore                                         |    2 +
 .travis.yml                                        |   22 +-
 Filelist                                           |   12 +-
 Makefile                                           |    4 +-
 README.md                                          |    1 +
 debian/changelog                                   |   24 +
 debian/changelog.upstream                          |  415 ++-
 debian/copyright                                   |  719 +++--
 ...of-more-LaTeX-commands-for-tex-filetype-d.patch |    4 +-
 ...t-filetype-using-the-contents-of-the-file.patch |    8 +-
 ...s-decision-to-disable-modelines-by-defaul.patch |    2 +-
 ...ng-a-vimrc.tiny-when-Vim-is-invoked-as-vi.patch |   14 +-
 debian/patches/series                              |   12 +-
 ...pus-to-deb-changelog-sources-syntax-files.patch |   53 -
 ...ing-compilation-date-in-SOURCE_DATE_EPOCH.patch |    6 +-
 ...ses-in-deb-changelog-sources-syntax-files.patch |   92 -
 ...dd-support-for-Build-Depends-Conflicts-Ar.patch |   40 +
 ...x-highlighting-of-javascript-in-debcontr.patch} |   16 +-
 ...ossible-overflow-with-corrupted-spell-fil.patch |   39 -
 ...ossible-overflow-when-reading-corrupted-u.patch |   47 -
 ...ossible-overflow-when-reading-corrupted-u.patch |   56 -
 ...-cannot-parse-some-etags-format-tags-file.patch |  103 -
 debian/policy/vim-policy.xml                       |    2 +-
 debian/rules                                       |    7 +-
 nsis/gvim.nsi                                      |    2 +
 runtime/autoload/ada.vim                           |   12 +-
 runtime/autoload/javascriptcomplete.vim            |    4 +-
 runtime/autoload/rust.vim                          |  415 +++
 runtime/autoload/rustfmt.vim                       |  107 +
 runtime/compiler/bdf.vim                           |    6 +-
 runtime/compiler/cargo.vim                         |   35 +
 runtime/compiler/gcc.vim                           |    6 +-
 runtime/compiler/rst.vim                           |   25 +-
 runtime/compiler/rustc.vim                         |   46 +
 runtime/defaults.vim                               |   24 +-
 runtime/doc/Makefile                               |    2 +
 runtime/doc/arabic.txt                             |   40 +-
 runtime/doc/autocmd.txt                            |    8 +-
 runtime/doc/change.txt                             |   14 +-
 runtime/doc/channel.txt                            |    7 +-
 runtime/doc/diff.txt                               |    7 +-
 runtime/doc/editing.txt                            |   11 +-
 runtime/doc/eval.txt                               |  803 +++--
 runtime/doc/filetype.txt                           |   12 +-
 runtime/doc/fold.txt                               |   10 +-
 runtime/doc/ft_ada.txt                             |    2 +-
 runtime/doc/ft_rust.txt                            |  237 ++
 runtime/doc/hangulin.txt                           |   18 +-
 runtime/doc/help.txt                               |    2 +-
 runtime/doc/helphelp.txt                           |   22 +-
 runtime/doc/if_mzsch.txt                           |    2 +-
 runtime/doc/if_ole.txt                             |    4 +-
 runtime/doc/if_perl.txt                            |    4 +-
 runtime/doc/if_pyth.txt                            |  115 +-
 runtime/doc/if_ruby.txt                            |    2 +-
 runtime/doc/indent.txt                             |   17 +-
 runtime/doc/index.txt                              |   42 +-
 runtime/doc/insert.txt                             |   19 +-
 runtime/doc/intro.txt                              |    4 +-
 runtime/doc/map.txt                                |    9 +-
 runtime/doc/message.txt                            |    9 +-
 runtime/doc/mlang.txt                              |    3 +-
 runtime/doc/motion.txt                             |    4 +-
 runtime/doc/netbeans.txt                           |    4 +-
 runtime/doc/options.txt                            |  388 ++-
 runtime/doc/os_beos.txt                            |    2 +-
 runtime/doc/os_mac.txt                             |   83 +-
 runtime/doc/os_vms.txt                             |   10 +-
 runtime/doc/os_win32.txt                           |   21 +-
 runtime/doc/pattern.txt                            |   62 +-
 runtime/doc/pi_getscript.txt                       |    4 +-
 runtime/doc/print.txt                              |   64 +-
 runtime/doc/quickfix.txt                           |   42 +-
 runtime/doc/quickref.txt                           |    2 +
 runtime/doc/quotes.txt                             |  114 +-
 runtime/doc/remote.txt                             |    3 +-
 runtime/doc/repeat.txt                             |   20 +-
 runtime/doc/scroll.txt                             |    2 +-
 runtime/doc/spell.txt                              |    4 +-
 runtime/doc/starting.txt                           |    5 +-
 runtime/doc/syntax.txt                             |   42 +-
 runtime/doc/tabpage.txt                            |   26 +-
 runtime/doc/tags                                   |   85 +-
 runtime/doc/term.txt                               |   36 +-
 runtime/doc/todo.txt                               |  297 +-
 runtime/doc/usr_02.txt                             |   14 +-
 runtime/doc/usr_03.txt                             |    2 +-
 runtime/doc/usr_09.txt                             |    4 +-
 runtime/doc/usr_41.txt                             |   21 +-
 runtime/doc/usr_44.txt                             |    4 +-
 runtime/doc/various.txt                            |   16 +-
 runtime/doc/version6.txt                           |   10 +-
 runtime/doc/version7.txt                           |  128 +-
 runtime/doc/version8.txt                           | 3120 +++++++++++++++++++-
 runtime/filetype.vim                               |   87 +-
 runtime/ftplugin/a2ps.vim                          |    6 +-
 runtime/ftplugin/alsaconf.vim                      |    6 +-
 runtime/ftplugin/arch.vim                          |    6 +-
 runtime/ftplugin/automake.vim                      |    6 +-
 runtime/ftplugin/awk.vim                           |   18 +
 runtime/ftplugin/bdf.vim                           |    6 +-
 runtime/ftplugin/calendar.vim                      |    6 +-
 runtime/ftplugin/cdrdaoconf.vim                    |    4 +-
 runtime/ftplugin/conf.vim                          |    6 +-
 runtime/ftplugin/crm.vim                           |    6 +-
 runtime/ftplugin/css.vim                           |    6 +-
 runtime/ftplugin/cvsrc.vim                         |    6 +-
 runtime/ftplugin/denyhosts.vim                     |    4 +-
 runtime/ftplugin/dictconf.vim                      |    6 +-
 runtime/ftplugin/dictdconf.vim                     |    6 +-
 runtime/ftplugin/dircolors.vim                     |    6 +-
 runtime/ftplugin/dosini.vim                        |    6 +-
 runtime/ftplugin/elinks.vim                        |    6 +-
 runtime/ftplugin/eterm.vim                         |    6 +-
 runtime/ftplugin/fetchmail.vim                     |    6 +-
 runtime/ftplugin/framescript.vim                   |    6 +-
 runtime/ftplugin/gpg.vim                           |    6 +-
 runtime/ftplugin/group.vim                         |    6 +-
 runtime/ftplugin/grub.vim                          |    6 +-
 runtime/ftplugin/hamster.vim                       |    6 +-
 runtime/ftplugin/haskell.vim                       |    6 +-
 runtime/ftplugin/help.vim                          |    6 +-
 runtime/ftplugin/hostconf.vim                      |    4 +-
 runtime/ftplugin/hostsaccess.vim                   |    6 +-
 runtime/ftplugin/indent.vim                        |    6 +-
 runtime/ftplugin/ld.vim                            |    6 +-
 runtime/ftplugin/lftp.vim                          |    6 +-
 runtime/ftplugin/libao.vim                         |    6 +-
 runtime/ftplugin/limits.vim                        |    6 +-
 runtime/ftplugin/loginaccess.vim                   |    6 +-
 runtime/ftplugin/logindefs.vim                     |    6 +-
 runtime/ftplugin/m4.vim                            |    6 +-
 runtime/ftplugin/mailaliases.vim                   |    4 +-
 runtime/ftplugin/mailcap.vim                       |    6 +-
 runtime/ftplugin/man.vim                           |    6 +-
 runtime/ftplugin/manconf.vim                       |    6 +-
 runtime/ftplugin/modconf.vim                       |    6 +-
 runtime/ftplugin/mplayerconf.vim                   |    6 +-
 runtime/ftplugin/muttrc.vim                        |    6 +-
 runtime/ftplugin/nanorc.vim                        |    6 +-
 runtime/ftplugin/netrc.vim                         |    6 +-
 runtime/ftplugin/nsis.vim                          |    6 +-
 runtime/ftplugin/pamconf.vim                       |    6 +-
 runtime/ftplugin/passwd.vim                        |    6 +-
 runtime/ftplugin/pinfo.vim                         |    6 +-
 runtime/ftplugin/procmail.vim                      |    6 +-
 runtime/ftplugin/prolog.vim                        |    6 +-
 runtime/ftplugin/protocols.vim                     |    6 +-
 runtime/ftplugin/quake.vim                         |    6 +-
 runtime/ftplugin/racc.vim                          |    6 +-
 runtime/ftplugin/readline.vim                      |    6 +-
 runtime/ftplugin/rnc.vim                           |    6 +-
 runtime/ftplugin/rst.vim                           |    6 +-
 runtime/ftplugin/rust.vim                          |  197 ++
 runtime/ftplugin/sbt.vim                           |   15 +
 runtime/ftplugin/screen.vim                        |    6 +-
 runtime/ftplugin/sensors.vim                       |    6 +-
 runtime/ftplugin/services.vim                      |    6 +-
 runtime/ftplugin/setserial.vim                     |    6 +-
 runtime/ftplugin/sieve.vim                         |    6 +-
 runtime/ftplugin/slpconf.vim                       |    6 +-
 runtime/ftplugin/slpreg.vim                        |    6 +-
 runtime/ftplugin/slpspi.vim                        |    6 +-
 runtime/ftplugin/sql.vim                           |   74 +-
 runtime/ftplugin/sshconfig.vim                     |    6 +-
 runtime/ftplugin/sudoers.vim                       |    6 +-
 runtime/ftplugin/sysctl.vim                        |    6 +-
 runtime/ftplugin/terminfo.vim                      |    6 +-
 runtime/ftplugin/tmux.vim                          |   12 +
 runtime/ftplugin/treetop.vim                       |    6 +-
 runtime/ftplugin/udevconf.vim                      |    6 +-
 runtime/ftplugin/udevperm.vim                      |    6 +-
 runtime/ftplugin/udevrules.vim                     |    6 +-
 runtime/ftplugin/updatedb.vim                      |    6 +-
 runtime/ftplugin/xdefaults.vim                     |    6 +-
 runtime/ftplugin/xf86conf.vim                      |    6 +-
 runtime/ftplugin/xinetd.vim                        |    6 +-
 runtime/ftplugin/xmodmap.vim                       |    6 +-
 runtime/ftplugin/yaml.vim                          |    6 +-
 runtime/indent/ada.vim                             |   20 +-
 runtime/indent/automake.vim                        |    6 +-
 runtime/indent/awk.vim                             |    6 +-
 runtime/indent/bst.vim                             |    4 +-
 runtime/indent/bzl.vim                             |    9 +-
 runtime/indent/cdl.vim                             |   18 +-
 runtime/indent/chaiscript.vim                      |    6 +-
 runtime/indent/clojure.vim                         |    8 +-
 runtime/indent/cmake.vim                           |    8 +-
 runtime/indent/cobol.vim                           |   24 +-
 runtime/indent/config.vim                          |    8 +-
 runtime/indent/css.vim                             |    5 +-
 runtime/indent/cucumber.vim                        |    4 +-
 runtime/indent/dictconf.vim                        |    6 +-
 runtime/indent/dictdconf.vim                       |    6 +-
 runtime/indent/docbk.vim                           |    6 +-
 runtime/indent/dtd.vim                             |   48 +-
 runtime/indent/dylan.vim                           |   12 +-
 runtime/indent/eiffel.vim                          |   21 +-
 runtime/indent/erlang.vim                          |   32 +-
 runtime/indent/eruby.vim                           |    6 +-
 runtime/indent/eterm.vim                           |   10 +-
 runtime/indent/falcon.vim                          |   16 +-
 runtime/indent/framescript.vim                     |   10 +-
 runtime/indent/gitconfig.vim                       |    4 +-
 runtime/indent/gitolite.vim                        |    8 +-
 runtime/indent/go.vim                              |   22 +-
 runtime/indent/haml.vim                            |    4 +-
 runtime/indent/hamster.vim                         |    4 +-
 runtime/indent/hog.vim                             |    6 +-
 runtime/indent/html.vim                            |   80 +-
 runtime/indent/idlang.vim                          |   14 +-
 runtime/indent/ishd.vim                            |    8 +-
 runtime/indent/java.vim                            |   29 +-
 runtime/indent/javascript.vim                      |  250 +-
 runtime/indent/json.vim                            |    6 +-
 runtime/indent/ld.vim                              |   12 +-
 runtime/indent/liquid.vim                          |    4 +-
 runtime/indent/logtalk.vim                         |   12 +-
 runtime/indent/lua.vim                             |    6 +-
 runtime/indent/make.vim                            |   16 +-
 runtime/indent/matlab.vim                          |    8 +-
 runtime/indent/mma.vim                             |    2 +-
 runtime/indent/ocaml.vim                           |   12 +-
 runtime/indent/occam.vim                           |    6 +-
 runtime/indent/pascal.vim                          |   28 +-
 runtime/indent/perl.vim                            |   16 +-
 runtime/indent/perl6.vim                           |   10 +-
 runtime/indent/php.vim                             |  105 +-
 runtime/indent/postscr.vim                         |    6 +-
 runtime/indent/pov.vim                             |    6 +-
 runtime/indent/prolog.vim                          |    8 +-
 runtime/indent/r.vim                               |   28 +-
 runtime/indent/readline.vim                        |   10 +-
 runtime/indent/rhelp.vim                           |    2 +-
 runtime/indent/rpl.vim                             |    8 +-
 runtime/indent/rst.vim                             |    6 +-
 runtime/indent/ruby.vim                            |    6 +-
 runtime/indent/rust.vim                            |  213 ++
 runtime/indent/sas.vim                             |  138 +
 runtime/indent/sass.vim                            |    4 +-
 runtime/indent/scala.vim                           |   34 +-
 runtime/indent/sdl.vim                             |    6 +-
 runtime/indent/sh.vim                              |   19 +-
 runtime/indent/sml.vim                             |   14 +-
 runtime/indent/sqlanywhere.vim                     |   24 +-
 runtime/indent/systemverilog.vim                   |    2 +-
 runtime/indent/tcl.vim                             |    6 +-
 runtime/indent/tcsh.vim                            |    6 +-
 runtime/indent/teraterm.vim                        |   18 +-
 runtime/indent/tex.vim                             |  137 +-
 runtime/indent/tf.vim                              |   14 +-
 runtime/indent/tilde.vim                           |    4 +-
 runtime/indent/treetop.vim                         |   10 +-
 runtime/indent/vb.vim                              |   10 +-
 runtime/indent/verilog.vim                         |   10 +-
 runtime/indent/vhdl.vim                            |   36 +-
 runtime/indent/xf86conf.vim                        |   10 +-
 runtime/indent/xinetd.vim                          |   10 +-
 runtime/indent/xml.vim                             |    4 +-
 runtime/indent/yacc.vim                            |    6 +-
 runtime/indent/yaml.vim                            |   14 +-
 runtime/macros/less.vim                            |   12 +-
 runtime/macros/matchit.vim                         |    4 +-
 runtime/menu.vim                                   |  126 +-
 runtime/mswin.vim                                  |   44 +-
 runtime/optwin.vim                                 |   11 +-
 runtime/pack/dist/opt/matchit/doc/matchit.txt      |    7 +-
 runtime/pack/dist/opt/matchit/plugin/matchit.vim   |   24 +-
 runtime/plugin/tarPlugin.vim                       |    1 +
 runtime/scripts.vim                                |  188 +-
 runtime/synmenu.vim                                |    4 +-
 runtime/syntax/a2ps.vim                            |    6 +-
 runtime/syntax/alsaconf.vim                        |    6 +-
 runtime/syntax/arch.vim                            |    6 +-
 runtime/syntax/autohotkey.vim                      |  196 +-
 runtime/syntax/bdf.vim                             |    6 +-
 runtime/syntax/c.vim                               |   58 +-
 runtime/syntax/calendar.vim                        |    6 +-
 runtime/syntax/cdrdaoconf.vim                      |    6 +-
 runtime/syntax/cdrtoc.vim                          |    6 +-
 runtime/syntax/cmusrc.vim                          |    4 +-
 runtime/syntax/cpp.vim                             |    4 +-
 runtime/syntax/crm.vim                             |    6 +-
 runtime/syntax/css.vim                             |    5 +-
 runtime/syntax/cvsrc.vim                           |    6 +-
 runtime/syntax/debchangelog.vim                    |   12 +-
 runtime/syntax/debcontrol.vim                      |    2 +-
 runtime/syntax/debsources.vim                      |   10 +-
 runtime/syntax/denyhosts.vim                       |    6 +-
 runtime/syntax/dictconf.vim                        |    6 +-
 runtime/syntax/dictdconf.vim                       |    6 +-
 runtime/syntax/elinks.vim                          |    6 +-
 runtime/syntax/erlang.vim                          |   30 +-
 runtime/syntax/eterm.vim                           |    6 +-
 runtime/syntax/fetchmail.vim                       |    6 +-
 runtime/syntax/framescript.vim                     |    6 +-
 runtime/syntax/gpg.vim                             |    6 +-
 runtime/syntax/group.vim                           |    6 +-
 runtime/syntax/grub.vim                            |    6 +-
 runtime/syntax/haskell.vim                         |    4 +-
 runtime/syntax/help.vim                            |    6 +-
 runtime/syntax/hostconf.vim                        |    6 +-
 runtime/syntax/html.vim                            |   21 +-
 runtime/syntax/indent.vim                          |   10 +-
 runtime/syntax/initex.vim                          |    8 +-
 runtime/syntax/ld.vim                              |    6 +-
 runtime/syntax/ldapconf.vim                        |    6 +-
 runtime/syntax/lftp.vim                            |    6 +-
 runtime/syntax/libao.vim                           |    6 +-
 runtime/syntax/limits.vim                          |    6 +-
 runtime/syntax/litestep.vim                        |    6 +-
 runtime/syntax/loginaccess.vim                     |    6 +-
 runtime/syntax/logindefs.vim                       |    6 +-
 runtime/syntax/mailaliases.vim                     |    6 +-
 runtime/syntax/manconf.vim                         |    6 +-
 runtime/syntax/matlab.vim                          |   10 +-
 runtime/syntax/modconf.vim                         |    6 +-
 runtime/syntax/nanorc.vim                          |    6 +-
 runtime/syntax/nasm.vim                            |   25 +-
 runtime/syntax/netrc.vim                           |    6 +-
 runtime/syntax/pamconf.vim                         |    6 +-
 runtime/syntax/passwd.vim                          |    6 +-
 runtime/syntax/php.vim                             |   52 +-
 runtime/syntax/pinfo.vim                           |    6 +-
 runtime/syntax/plaintex.vim                        |    6 +-
 runtime/syntax/protocols.vim                       |    6 +-
 runtime/syntax/quake.vim                           |    8 +-
 runtime/syntax/r.vim                               |  177 +-
 runtime/syntax/racc.vim                            |    6 +-
 runtime/syntax/readline.vim                        |    6 +-
 runtime/syntax/rmd.vim                             |   92 +-
 runtime/syntax/rnc.vim                             |    6 +-
 runtime/syntax/rust.vim                            |  295 ++
 runtime/syntax/sas.vim                             |  508 ++--
 runtime/syntax/sbt.vim                             |   32 +
 runtime/syntax/scala.vim                           |    4 +-
 runtime/syntax/sensors.vim                         |    6 +-
 runtime/syntax/services.vim                        |    6 +-
 runtime/syntax/setserial.vim                       |    6 +-
 runtime/syntax/sh.vim                              |   20 +-
 runtime/syntax/sieve.vim                           |    6 +-
 runtime/syntax/slpconf.vim                         |    6 +-
 runtime/syntax/slpreg.vim                          |    6 +-
 runtime/syntax/slpspi.vim                          |    6 +-
 runtime/syntax/sudoers.vim                         |    6 +-
 runtime/syntax/sysctl.vim                          |    6 +-
 runtime/syntax/terminfo.vim                        |    6 +-
 runtime/syntax/tex.vim                             |   38 +-
 runtime/syntax/tmux.vim                            |  124 +
 runtime/syntax/treetop.vim                         |    6 +-
 runtime/syntax/udevconf.vim                        |    6 +-
 runtime/syntax/udevperm.vim                        |    6 +-
 runtime/syntax/udevrules.vim                       |    6 +-
 runtime/syntax/updatedb.vim                        |    6 +-
 runtime/syntax/vim.vim                             |    7 +-
 runtime/syntax/xinetd.vim                          |    6 +-
 runtime/syntax/xmodmap.vim                         |    6 +-
 runtime/syntax/xpm.vim                             |    7 +-
 runtime/syntax/xpm2.vim                            |    7 +-
 runtime/syntax/zsh.vim                             |  228 +-
 runtime/tools/unicode.vim                          |    6 +-
 runtime/tutor/tutor.es                             |    2 +-
 runtime/tutor/tutor.fr                             |   12 +-
 runtime/tutor/tutor.fr.utf-8                       |   12 +-
 runtime/tutor/tutor.it                             |    4 +-
 runtime/tutor/tutor.it.utf-8                       |    4 +-
 runtime/tutor/tutor.pt                             |  472 +--
 runtime/tutor/tutor.pt.utf-8                       |  472 +--
 src/GvimExt/Makefile                               |   10 +-
 src/Make_mvc.mak                                   |  129 +-
 src/Makefile                                       |  188 +-
 src/arabic.c                                       |  900 ++----
 src/auto/configure                                 |   76 +-
 src/buffer.c                                       |   67 +-
 src/channel.c                                      |   67 +-
 src/charset.c                                      |  107 +-
 src/config.h.in                                    |   11 +-
 src/config.mk.dist                                 |    2 +-
 src/configure.ac                                   |   76 +-
 src/create_cmdidxs.vim                             |   81 +
 src/dict.c                                         |   29 +-
 src/diff.c                                         |   63 +-
 src/edit.c                                         |  380 ++-
 src/eval.c                                         |  308 +-
 src/evalfunc.c                                     |  552 ++--
 src/ex_cmdidxs.h                                   |   72 +
 src/ex_cmds.c                                      |  234 +-
 src/ex_cmds.h                                      |   51 +-
 src/ex_cmds2.c                                     |  337 ++-
 src/ex_docmd.c                                     |  463 ++-
 src/ex_getln.c                                     |   93 +-
 src/farsi.c                                        |  724 +++--
 src/fileio.c                                       |  803 ++---
 src/fold.c                                         |  290 +-
 src/getchar.c                                      |  102 +-
 src/globals.h                                      |   17 +-
 src/gui.c                                          |   62 +-
 src/gui_at_sb.c                                    |    3 +-
 src/gui_athena.c                                   |    3 +-
 src/gui_beval.c                                    |   15 +-
 src/gui_gtk.c                                      |    9 +-
 src/gui_gtk_f.c                                    |  188 +-
 src/gui_gtk_f.h                                    |   12 -
 src/gui_gtk_x11.c                                  |  114 +-
 src/gui_motif.c                                    |    4 +-
 src/gui_w32.c                                      |  139 +-
 src/gui_x11.c                                      |   40 +-
 src/gui_xmdlg.c                                    |    4 +-
 src/hardcopy.c                                     |    2 +-
 src/if_cscope.c                                    |   24 +-
 src/if_lua.c                                       |    9 +
 src/if_perl.xs                                     |   40 +-
 src/if_py_both.h                                   |   29 +-
 src/if_python.c                                    |    9 +
 src/if_python3.c                                   |    9 +
 src/if_ruby.c                                      |    5 +
 src/if_tcl.c                                       |    5 +-
 src/if_xcmdsrv.c                                   |   44 +-
 src/install-sh                                     |  501 ++++
 src/installman.sh                                  |    2 +-
 src/installml.sh                                   |    2 +-
 src/json.c                                         |   14 +-
 src/json_test.c                                    |    6 +
 src/keymap.h                                       |    9 +-
 src/kword_test.c                                   |   85 +
 src/list.c                                         |   22 +-
 src/macros.h                                       |   70 +-
 src/main.c                                         |  188 +-
 src/mark.c                                         |   73 +-
 src/mbyte.c                                        |  189 +-
 src/memline.c                                      |   30 +-
 src/menu.c                                         |   40 +-
 src/message.c                                      |  148 +-
 src/message_test.c                                 |    2 -
 src/misc1.c                                        |  292 +-
 src/misc2.c                                        |  207 +-
 src/mkinstalldirs                                  |   38 -
 src/move.c                                         |   11 +-
 src/netbeans.c                                     |   14 +-
 src/normal.c                                       |  164 +-
 src/ops.c                                          |  116 +-
 src/option.c                                       |  499 +++-
 src/option.h                                       |    9 +
 src/os_amiga.c                                     |    6 +-
 src/os_mswin.c                                     |   85 +-
 src/os_unix.c                                      |   53 +-
 src/os_unix.h                                      |   12 +-
 src/os_unixx.h                                     |   11 +-
 src/os_w32exe.c                                    |    7 +-
 src/os_win32.c                                     |  188 +-
 src/os_win32.h                                     |    4 +-
 src/po/Makefile                                    |   11 +-
 src/po/eo.po                                       |   54 +-
 src/po/fr.po                                       |   57 +-
 src/po/it.po                                       |  880 +++---
 src/po/zh_CN.UTF-8.po                              |    3 +-
 src/po/zh_CN.cp936.po                              |   13 +-
 src/popupmnu.c                                     |    6 +-
 src/proto/dict.pro                                 |    1 +
 src/proto/edit.pro                                 |    1 +
 src/proto/eval.pro                                 |    2 +-
 src/proto/ex_cmds2.pro                             |    9 +-
 src/proto/ex_getln.pro                             |    1 +
 src/proto/fold.pro                                 |    1 +
 src/proto/getchar.pro                              |    4 +-
 src/proto/if_xcmdsrv.pro                           |    4 +-
 src/proto/list.pro                                 |    1 +
 src/proto/main.pro                                 |    2 +
 src/proto/mark.pro                                 |    1 +
 src/proto/mbyte.pro                                |    1 +
 src/proto/message.pro                              |    6 +-
 src/proto/misc2.pro                                |    3 +-
 src/proto/ops.pro                                  |    2 +
 src/proto/os_mswin.pro                             |    4 +-
 src/proto/os_win32.pro                             |    1 +
 src/proto/quickfix.pro                             |    3 +-
 src/proto/regexp.pro                               |    2 +-
 src/proto/screen.pro                               |    3 +-
 src/proto/search.pro                               |    4 +-
 src/proto/syntax.pro                               |    3 +-
 src/proto/tag.pro                                  |    2 +-
 src/proto/term.pro                                 |    2 +
 src/proto/ui.pro                                   |    1 +
 src/proto/window.pro                               |    2 +
 src/quickfix.c                                     |  501 +++-
 src/regexp.c                                       |  183 +-
 src/regexp.h                                       |    4 +-
 src/regexp_nfa.c                                   |  106 +-
 src/screen.c                                       |  505 ++--
 src/search.c                                       |  241 +-
 src/spell.c                                        |  144 +-
 src/spellfile.c                                    |   19 +-
 src/structs.h                                      |   49 +-
 src/swis.s                                         |  143 -
 src/syntax.c                                       |  285 +-
 src/tag.c                                          |  175 +-
 src/term.c                                         |  408 ++-
 src/term.h                                         |  140 +-
 src/testdir/Make_all.mak                           |   44 +-
 src/testdir/Make_dos.mak                           |   25 +-
 src/testdir/Make_ming.mak                          |   23 +-
 src/testdir/Make_vms.mms                           |   10 +-
 src/testdir/Makefile                               |   25 +-
 src/testdir/gen_opt_test.vim                       |  212 ++
 src/testdir/gui_init.vim                           |    6 +
 src/testdir/gui_preinit.vim                        |    7 +
 src/testdir/pyxfile/py2_magic.py                   |    4 +
 src/testdir/pyxfile/py2_shebang.py                 |    4 +
 src/testdir/pyxfile/py3_magic.py                   |    4 +
 src/testdir/pyxfile/py3_shebang.py                 |    4 +
 src/testdir/pyxfile/pyx.py                         |    2 +
 src/testdir/runtest.vim                            |  143 +-
 src/testdir/setup_gui.vim                          |   32 +
 src/testdir/shared.vim                             |   30 +-
 src/testdir/test103.in                             |    1 +
 src/testdir/test14.in                              |    1 +
 src/testdir/test29.in                              |    1 +
 src/testdir/test3.in                               |    6 +-
 src/testdir/test30.in                              |    1 +
 src/testdir/test32.in                              |    1 +
 src/testdir/test36.in                              |   12 +-
 src/testdir/test36.ok                              |    6 +
 src/testdir/test45.in                              |    2 +
 src/testdir/test49.vim                             |    2 +-
 src/testdir/test58.in                              |  656 ----
 src/testdir/test58.ok                              |  289 --
 src/testdir/test65.in                              |   95 -
 src/testdir/test65.ok                              |   73 -
 src/testdir/test72.in                              |    2 +-
 src/testdir/test73.in                              |    1 +
 src/testdir/test77.in                              |    1 +
 src/testdir/test78.in                              |    2 +-
 src/testdir/test82.in                              |  103 -
 src/testdir/test82.ok                              |    5 -
 src/testdir/test85.in                              |    1 +
 src/testdir/test87.in                              |   15 +-
 src/testdir/test89.in                              |   71 -
 src/testdir/test89.ok                              |   28 -
 src/testdir/test90.in                              |   53 -
 src/testdir/test90.ok                              |    6 -
 src/testdir/test91.in                              |   29 +-
 src/testdir/test91.ok                              |   14 -
 src/testdir/test94.in                              |    1 +
 src/testdir/test_alot.vim                          |   19 +-
 src/testdir/test_alot_utf8.vim                     |    3 +
 src/testdir/test_arabic.vim                        |  613 ++++
 src/testdir/test_arglist.vim                       |   51 +-
 src/testdir/test_assert.vim                        |   20 +
 src/testdir/test_assign.vim                        |   22 +
 src/testdir/test_autocmd.vim                       |   79 +-
 src/testdir/test_breakindent.vim                   |  251 +-
 src/testdir/test_cd.vim                            |   13 +
 src/testdir/test_changedtick.vim                   |   57 +
 src/testdir/test_channel.vim                       |   53 +-
 src/testdir/test_channel_pipe.py                   |    5 +
 src/testdir/test_charsearch_utf8.vim               |   22 +
 src/testdir/test_cindent.vim                       |   76 +
 src/testdir/test_clientserver.vim                  |  107 +
 src/testdir/test_close_count.in                    |    1 +
 src/testdir/test_cmdline.vim                       |  188 +-
 src/testdir/test_cscope.vim                        |    2 +-
 src/testdir/test_cursor_func.vim                   |   12 +-
 src/testdir/test_delete.vim                        |    8 +
 src/testdir/test_diffmode.vim                      |  333 ++-
 src/testdir/test_digraph.vim                       |    1 +
 src/testdir/test_display.vim                       |   68 +-
 src/testdir/test_edit.vim                          | 1365 +++++++++
 src/testdir/test_erasebackword.in                  |    1 +
 src/testdir/test_ex_z.vim                          |   85 +
 src/testdir/test_expand_dllpath.vim                |    2 +-
 src/testdir/test_expr.vim                          |    7 +-
 src/testdir/test_farsi.vim                         |   49 +
 src/testdir/test_fileformat.vim                    |   16 +
 src/testdir/test_filetype.vim                      |   43 +
 src/testdir/test_findfile.vim                      |   25 +
 src/testdir/test_float_func.vim                    |   47 +
 src/testdir/test_fnamemodify.vim                   |    8 +-
 src/testdir/test_fold.vim                          |  387 ++-
 src/testdir/test_functions.vim                     |  793 +++++
 src/testdir/test_ga.vim                            |   37 +
 src/testdir/test_gf.vim                            |   27 +-
 src/testdir/test_global.vim                        |   20 +
 src/testdir/test_gn.vim                            |   27 +-
 src/testdir/test_goto.vim                          |   21 +
 src/testdir/test_gui.vim                           |  679 ++++-
 src/testdir/test_gui_init.vim                      |   60 +
 src/testdir/test_hardcopy.vim                      |   11 +
 src/testdir/test_help.vim                          |   15 +
 src/testdir/test_help_tagjump.vim                  |   56 +
 src/testdir/test_hlsearch.vim                      |   19 +
 src/testdir/test_json.vim                          |    5 +
 src/testdir/test_listlbr.in                        |  119 -
 src/testdir/test_listlbr.ok                        |   62 -
 src/testdir/test_listlbr.vim                       |  235 ++
 src/testdir/test_listlbr_utf8.in                   |  134 -
 src/testdir/test_listlbr_utf8.ok                   |   57 -
 src/testdir/test_listlbr_utf8.vim                  |  271 ++
 src/testdir/test_lua.vim                           |   22 +
 src/testdir/test_makeencoding.py                   |   67 +
 src/testdir/test_makeencoding.vim                  |  106 +
 src/testdir/test_mapping.vim                       |   42 +-
 src/testdir/test_marks.vim                         |   44 +
 src/testdir/test_menu.vim                          |   25 +-
 src/testdir/test_mksession.vim                     |   29 +-
 src/testdir/test_normal.vim                        |  152 +-
 src/testdir/test_number.vim                        |  254 ++
 src/testdir/test_options.vim                       |  203 ++
 src/testdir/test_packadd.vim                       |   37 +
 src/testdir/test_paste.vim                         |   99 +
 src/testdir/test_perl.vim                          |  129 +-
 src/testdir/test_popup.vim                         |  153 +-
 src/testdir/test_put.vim                           |   47 +
 src/testdir/test_python2.vim                       |   24 +
 src/testdir/test_python3.vim                       |   24 +
 src/testdir/test_pyx2.vim                          |   74 +
 src/testdir/test_pyx3.vim                          |   74 +
 src/testdir/test_quickfix.vim                      |  690 ++++-
 src/testdir/test_quotestar.vim                     |  146 +
 src/testdir/test_recover.vim                       |   18 +
 src/testdir/test_regexp_latin.vim                  |   10 +
 src/testdir/test_regexp_utf8.vim                   |   82 +-
 src/testdir/test_retab.vim                         |   77 +
 src/testdir/test_ruby.vim                          |   17 +
 src/testdir/test_search.vim                        |   36 +-
 src/testdir/test_sha256.vim                        |   22 +
 src/testdir/test_spell.vim                         |  768 +++++
 src/testdir/test_startup.vim                       |   90 +-
 src/testdir/test_stat.vim                          |   35 +-
 src/testdir/test_statusline.vim                    |  251 +-
 src/testdir/test_substitute.vim                    |   75 +
 src/testdir/test_syntax.vim                        |  358 +++
 src/testdir/test_tabpage.vim                       |  242 +-
 src/testdir/test_tagjump.vim                       |   66 +
 src/testdir/test_taglist.vim                       |   58 +
 src/testdir/test_tcl.vim                           |   23 +
 src/testdir/test_textobjects.vim                   |   27 +-
 src/testdir/test_timers.vim                        |   16 +
 src/testdir/test_undo.vim                          |   13 +-
 src/testdir/test_unlet.vim                         |    4 +
 src/testdir/test_usercommands.vim                  |  105 +
 src/testdir/test_utf8.in                           |   46 -
 src/testdir/test_utf8.ok                           |   22 -
 src/testdir/test_utf8.vim                          |   65 +
 src/testdir/test_utf8_comparisons.vim              |   95 +
 src/testdir/test_viminfo.vim                       |    4 +-
 src/testdir/{test_viml.vim => test_vimscript.vim}  |  126 +-
 src/testdir/test_visual.vim                        |   29 +
 src/testdir/test_window_cmd.vim                    |  349 +++
 src/testdir/test_writefile.vim                     |   39 +-
 src/testdir/unix.vim                               |    8 +
 src/testdir/view_util.vim                          |   30 +
 src/ui.c                                           |   35 +-
 src/undo.c                                         |   48 +-
 src/userfunc.c                                     |  246 +-
 src/version.c                                      |  992 ++++++-
 src/vim.h                                          |   66 +-
 src/winclip.c                                      |    8 +-
 src/window.c                                       |   85 +-
 src/workshop.c                                     |    2 +-
 659 files changed, 32896 insertions(+), 11936 deletions(-)

diff --cc debian/changelog
index 3108e73,edeed60..bccc94b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,27 +1,36 @@@
+ vim (2:8.0.0691-1) UNRELEASED; urgency=medium
+ 
+   [ upstream ]
+   * 8.0.0210 et.al.: Add support for bracketed paste.  (Closes: #504244)
+   * 8.0.0421: Fix display in diff mode when adding a line at the end of a
+     buffer.  (Closes: #846993)
+ 
+   [ James McCoy ]
+   * vim-policy:
+     + Specify the "addon", not "name", field is used to declare the addon.
+       Thanks to Reiner Herrmann.
+   * Merge changes from Ubuntu, dependent on DEB_VENDOR=Ubuntu:
+     + Remove --disable-python3interp on Ubuntu for vim-basic
+     + Disable ruby for vim-gtk3
+   * d/rules:
+     + Remove src/po/vim.pot and *.pyc during clean
+   * debcontrol.vim:
+     + Add highlighting for Build-(Depends|Conflicts)-Arch
+     + Fix syntax highlighting of "javascript" section.  (Closes: #867307)
+   * Rewrite d/copyright in machine readable format.  (Closes: #819734)
+     + Properly document xxd's license.  (Closes: #776191)
+ 
+  -- James McCoy <jamessan at debian.org>  Sat, 17 Jun 2017 21:51:10 -0400
+ 
 +vim (2:8.0.0197-5) unstable; urgency=high
 +
 +  * Backport upstream patches to fix CVE-2017-11109  (Closes: #867720)
 +    + 8.0.0703: Illegal memory access with empty :doau command
 +    + 8.0.0706: Crash when cancelling the cmdline window in Ex mode
 +    + 8.0.0707: Freeing wrong memory when manipulating buffers in autocommands
 +
 + -- James McCoy <jamessan at debian.org>  Tue, 11 Jul 2017 23:11:25 -0400
 +
  vim (2:8.0.0197-4) unstable; urgency=medium
  
    * Backport upstream patch v8.0.0550 to fix a regression in tag lookups for
diff --cc debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
index d8a8f12,a92474b..5dfbabb
--- a/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
+++ b/debian/patches/debian/Document-Debian-s-decision-to-disable-modelines-by-defaul.patch
@@@ -15,10 -15,10 +15,10 @@@ Signed-off-by: James McCoy <jamessan at de
   1 file changed, 1 insertion(+), 1 deletion(-)
  
  diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
- index 88dca60..2520cc3 100644
+ index 4a775fc..a08b173 100644
  --- a/runtime/doc/options.txt
  +++ b/runtime/doc/options.txt
 -@@ -5222,7 +5222,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 +@@ -5126,7 +5126,7 @@ A jump table for the options with a short description can be found at |Q_op|.
   
   				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
   'modeline' 'ml'		boolean	(Vim default: on (off for root),

-- 
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