Last commit made on 2018-06-05
Get this branch:
git clone -b ubuntu/cosmic-proposed https://git.launchpad.net/ubuntu/+source/vim
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

d1d9f0a... by Adam Conrad on 2018-06-05

Import patches-unapplied version 2:8.0.1766-1ubuntu1 to ubuntu/cosmic-proposed

Imported using git-ubuntu import.

Changelog parent: 1ce51861095c269d85dda1c73d8dc7eb598e511a

New changelog entries:
  * Merge with Debian; remaining changes:
    - debian/runtime/vimrc:
      + "syntax on" is a sane default for non-tiny vim.
    - debian/patches/debian/ubuntu-grub-syntax.patch:
      + Add Ubuntu-specific "quiet" keyword.
    - debian/patches/debian/update-upstart-syntax.patch:
      + Add setuid and setgid to syntax file.
    - debian/patches/ubuntu-series-support.patch:
      + Drop vivid, wily, and yakkety, and zesty.
      + Add bionic and cosmic.
    - debian/patches/ubuntu-mouse-off.patch:
      + Mouse mode is actively harmful in some chroots.

1ce5186... by James McCoy on 2018-04-27

Import patches-unapplied version 2:8.0.1766-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: cef773b3e2d196486c4e0b9cf8185e98efbaeefb

New changelog entries:
  [ David Rabel ]
  * d/copyright: Fix path to tee.c
  [ upstream ]
  * 8.0.1477: Avoid cursor flicker when changing (de)focusing the terminal.
    (Closes: #890642)
  * 8.0.1491: New 'pumwidth' option allows controlling the width of the popup
    menu. (Closes: #450481)
  * 8.0.1744: Skip Test_writefile_sync_dev_stdout when /dev/stdout isn't
    writable. (Closes: #894565)
  * syntax/config.vim: Fix highlighting matching paren for AC_MSG_* syntax
    items. (Closes: #881654)
  * syntax/debcontrol.vim: Recognize Testsuite and Testsuite-Triggers fields.
    (Closes: #886230)
  * syntax/sh.vim: Do not highlight substring processing as an error for POSIX
    sh. (Closes: #885938)
  [ James McCoy ]
  * watch: Track git tags instead of major releases
  * Declare compliance with Policy 4.1.4, no changes needed
  * control: Use 11~ for minimum debhelper version to ease backporting
  * rules:
    + Fold config.mk handling into autoconf-stamp target
    + Use C.UTF-8 locale when running tests to avoid an upstream bug in the
      tests. When not run in a UTF-8 locale, a child Vim used by the tests
      displays some unicode characters incorrectly, breaking the test.

cef773b... by James McCoy on 2018-02-02

Import patches-unapplied version 2:8.0.1453-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 28a9860c05a93a38800d8963370bc101c4b53568

New changelog entries:
  [ upstream ]
  * 8.0.1452: terminal test fails on some systems
    + This should fix the massive FTBFS on the buildds
  * 8.0.1453: terminal test fails on some slow terminals

28a9860... by James McCoy on 2018-02-02

Import patches-unapplied version 2:8.0.1451-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 95b2dd7f1bc3a89e16537bd1bc5b2d553640b0d7

New changelog entries:
  [ David Rabel ]
  * Update Standards-Version to 4.1.3
  [ upstream ]
  * 8.0.1444: missing -D_FILE_OFFSET_BITS=64 may cause problems
    This should work around the inconsistent handling of large file support in
    glibc (#888566), which closes: #827319.
  [ James McCoy ]
  * Re-enable Perl bindings on kFreeBSD
  * Change Vcs-* to salsa.d.o
  * Bump debhelper compat to 11
  * Set R³ to no
  * d/control: Use https URL for Homepage
  * vim-doc: Move documentation under /usr/share/doc/vim, per §12.3
  * Remove doc/<arch pkg> → doc/<all pkg> symlinks
  * d/rules: Set .NOTPARALLEL to avoid dh_prep clobbering each other

95b2dd7... by James McCoy on 2017-12-24

Import patches-unapplied version 2:8.0.1401-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 06fb96d20adfdd5a6ccf3fca9009379f2707e0b9

New changelog entries:
  * debian.vim: Move a function definition inside an :if so it doesn't cause
    vim-tiny to spew lots of errors. (Closes: #885073)

06fb96d... by James McCoy on 2017-12-18

Import patches-unapplied version 2:8.0.1401-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e4d4738385c05c9331483a5e38bac978a5706695

New changelog entries:
  [ upstream ]
  * syntax/sh.vim:
    + Fix syntax highlighting of $() when the /bin/sh is detected as
      POSIX-compliant. (Closes: #848663)
    + Correctly highlight escaped single-quotes inside test expressions.
      (Closes: #761064)
  [ James McCoy ]
  * runtime/debian.vim:
    + Fix mechanism used to check for <S-Insert> mappings, since maparg()
      doesn't understand multiple modes in the {mode} argument. Thanks to
      Sergey Vlasov for the patch! (Closes: #883422)
  * syntax/debcontrol.vim:
    + Fix highlighting of "Section: javascript" … again. (Closes: #884495)

e4d4738... by James McCoy on 2017-11-04

Import patches-unapplied version 2:8.0.1257-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 919dda09824c5aff7af9b3e9483450617c509d0d

New changelog entries:
  * Add patch to fix flakiness in test_search.vim
  * syntax/debcontrol.vim:
    + Recognize golang section. Thanks to Guillem Jover. (Closes: #880698)

919dda0... by James McCoy on 2017-11-03

Import patches-unapplied version 2:8.0.1257-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 34de0fe15049b5b8cc617ea862c4d9a18d448f6a

New changelog entries:
  [ upstream ]
  * 8.0.1246: Fix flaky popup test, which should fix the various FTBFS from
    the last upload.
  [ James McCoy ]
  * syntax/debsources.vim:
    + Fix syntax error in definition of unsupported releases. Thanks to Josh
      Triplett. (Closes: #879986)
  * Declare compliance with Policy 4.1.1, no changes needed.

34de0fe... by James McCoy on 2017-10-27

Import patches-unapplied version 2:8.0.1226-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 1510009ef2e95c3de98d3ce9089382e3edb35c6c

New changelog entries:
  [ upstream ]
  * 8.0.1154: Fix indentation when 'indentkeys' is in use. (Closes: #877262)
  [ James McCoy ]
  * syntax/debcontrol.vim:
    + Add support for all fields in deb-src-control(5). (Closes: #878970)
  * syntax/deb{sources,changelog}.vim:
    + Add bionic release and mark yakkety & squeeze unsupported.

1510009... by James McCoy on 2017-09-25

Import patches-unapplied version 2:8.0.1144-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: afb1c05bdbef1c6166485782f73d3418b79790e9

New changelog entries:
  [ upstream ]
  * Fix detection/enabling of cursor blink state. (Closes: #872302)
  * ftplugin/perl.vim: Set 'iskeyword' local to the buffer so it doesn't
    affect subsequently opened buffers. (Closes: #873755)
  * syntax/mason.vim: Correctly highlight mason files again. (Closes:
  [ James McCoy ]
  * debcontrol.vim:
    + Recognize Testsuite field (Closes: #872360)
    + Treat tabs as valid whitespace (Closes: #872557)
  * Declare compliance with Policy 4.1.0, no changes needed
  * Add basic autopkgtests
  * Add missing postrm for symlink_to_dir maintscripts