Last commit made on 2016-04-08
Get this branch:
git clone -b ubuntu/xenial 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

6cbe79a... by Matthias Klose on 2016-04-08

Import patches-unapplied version 2:7.4.1689-3ubuntu1 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 2bbde6426ad93a4afde9ae28e410e15383ce6158

New changelog entries:
    - 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/debian/ubuntu-releases.patch:
      + Add support for xenial, drop utopic to unsupported.
    - debian/rules: Stop ignoring failures from flaky test86.
    - Build using Python3.
    - Build python2 variants for gtk, gtk3, gnome, athena, nox.

2bbde64... by James McCoy on 2016-04-08

Import patches-unapplied version 2:7.4.1689-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e6bb33cf210237d3cddfc60be5215fc5d8310d6e

New changelog entries:
  * helpztags: Fix regression in previous upload where the doc file isn't
    opened, so no tags file is generated. (Closes: #820313)

e6bb33c... by James McCoy on 2016-04-03

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

Imported using git-ubuntu import.

Changelog parent: f67ae528aa1d0ae179ca917aa9e8931bdbbb7d77

New changelog entries:
  * Stop installing a dangling symlink at
    /usr/share/vim/addons/doc/matchit.txt. (Closes: #819796)
  * Lintian:
    + Provide more details in vim-doc's long description. Thanks to Elimar
      Riesebieter for the patch. (Closes: #819733)
  * helpztags:
    + Don't try to read a file if it can't be opened. (Closes: #819764)
    + Don't error if the specified directory doesn't exist. (Closes: #819809)
  * Generate vim-policy in a consistent locale.

f67ae52... by James McCoy on 2016-04-01

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

Imported using git-ubuntu import.

Changelog parent: 5c32b59e303dd7bef860284d9d092b8071f64f1d

New changelog entries:
  * Merge upstream tag v7.4.1689.
    + Highlighted changes:
      - 7.4.1142: “:syn iskeyword” command to define the set of keyword
        characters for syntax highlighting, rather than changing the buffer's
        'iskeyword' option.
      - 7.4.1154 et.al.: Support converting between JSON
        and VimL. See json_decode(), json_encode(), js_decode(), and
      - 7.4.1169 et.al.: Support async communication with external processes
        using the new channel and job features.
      - 7.4.1384 et.al.: Provide native support for managing Vim
        addons/packages with the :packadd command and 'packpath' option.
      - 7.4.1402: GTK3 GUI support
      - 7.4.1578: Support running a function on a periodic basis with the
        timer_start()/timer_start() functions.
      - runtime/syntax/sh.vim
        + Fix incorrect highlighting when case/esac are embedded in a word.
          (Closes: #818137)
      - runtime/syntax/sshdconfig.vim
        + Update with recent keywords, including VersionAddendum. (Closes:
  * Add a vim-gtk3 package. (Closes: #815750)
  * Improve reproducibility of Vim builds. (Closes: #787327)
    + Use $SOURCE_DATE_EPOCH to set the compilation time displayed in :version
    + Set a static value for configure's --with-compiledby argument
  * Migrate to automatic -dbgsym packages
  * Declare compliance with Policy 3.9.7, no changes needed.
  * Stop installing empty icon directories in vim-common. Thanks to Elimar
    Riesebieter for the patch. (Closes: #819653)

5c32b59... by James McCoy on 2015-12-10

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

Imported using git-ubuntu import.

Changelog parent: f2c58faef57fec6706390dbd9b5ce38d8a522e31

New changelog entries:
  * Merge upstream tag v7.4.963.
    + Remove merged patches:
      - Typo in Spanish translation of swapfile recovery.
    + Highlighted changes:
      - 7.4.849: New Insert mode command to maintain the undo sequence across
        cursor movements (c.f., :help i_CTRL-G_U).
      - 7.4.858: New quickfix-related commands (:ldo, :lfdo, :cdo, and :cfdo).
      - indent/yaml.vim: Maintain indent of mapping key when mapping is
        contained in a list. (Closes: #713066)
      - 7.4.941: New 'tagcase' option to control whether tag searches are case
  * Rewrite vim-tiny's help.txt.
    + Clarify the reasoning for the package and why the help isn't available.
    + Explicitly mention what the more featureful Vim packages are.
    + Point to vimhelp.appspot.com for online help, since it is better kept
  * Update Vcs-* URLs to point to Git.
  * Install upstream's patchlist as the changelog. (Closes: #622827)
  * Fix a typo in vim-policy. Thanks to Jakuyo Friel for the patch. (Closes:
  * Fix FTBFS when running “dpkg-buildpackage -A”. (Closes: #806785)
  * Stop installing menu files.
  * Install upstream's desktop files and drop the ones from debian/.
  * Mark vim-runtime/vim-gui-common as Multi-Arch: foreign. (Closes: #806535)

f2c58fa... by James McCoy on 2015-08-17

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

Imported using git-ubuntu import.

Changelog parent: 3b6a45637506fc0b1f3b5675d27648da627adf38

New changelog entries:
  * Merge upstream tag v7-4-826. Remove merged patches.
    + Recognize bash completion files for syntax highlighting. (Closes:
    + Update declared license for xxd. (Closes: #776191)
  * Enable <S-Insert> mappings when gvim is started via “:gui”. Based on a
    patch from Daniel Shahaf. (Closes: #793781)

3b6a456... by James McCoy on 2015-06-13

Import patches-unapplied version 2:7.4.712-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 80c956f639518269ac882ea2cd8216ff310bdd9f

New changelog entries:
  * Change Suggests: ttf-dejavu → fonts-dejavu. (Closes: #783969)
  * Welcome, wily werewolf.
  * Remove vim-lesstif transitional package.
  * Remove obsolete Breaks/Replaces from vim-gui-common.
  * Lintian:
    + Add override to vim-common for desktop-command-not-in-package, since vim
      is provided by the other binary packages.
    + Remove spelling-error-in-binary overrides for tEH
    + Remove empty /usr/share/pixmaps directory from vim-gui-common
  * Declare compliance with policy 3.9.6
  * Fix FTBFS with newer ghostscript by using ps2write device. (Closes:
  * Make build resilient to changes in the default tcl version.
  * Update description of vim-tiny to clarify it only exists to provide the vi
    binary for the base install. (Closes: #784268)

80c956f... by James McCoy on 2015-05-01

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

Imported using git-ubuntu import.

Changelog parent: be1c760b003b24998d6a5e170b663128cd5cdf1a

New changelog entries:
  * Add stretch to Debian syntax files. (Closes: #783506)
  * syntax/debsources.vim: Recognize all Debian/Ubuntu releases, but highlight
    unsupported releases differently.
  * Add patch upstream/lcs_space-overflow.patch, which fixes an integer
    overflow when determining whether to apply listchar's space setting. This
    fixes the test_listchars failure on certain architectures when PIE is

be1c760... by James McCoy on 2015-04-25

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

Imported using git-ubuntu import.

Changelog parent: 2206e3f5d3f8215bb643a14c684c0b74dd08645b

New changelog entries:
  * Merge upstream tag v7-4-712
    + 7.4.586: Remove a cyclic dependency when generating documentation, which
      results in unreproducible builds. (Closes: #775562)
    + 7.4.609: Use a stack of dicts and lists to be marked for garbage
      collection, thus making it iterative instead of recursive. Fixes crash
      with some plugins written in other languages (e.g., lua). (Closes:
    + runtime/syntax/registry.vim: Correct highlighting of comments. (Closes:
    + runtime/syntax/strace.vim: Highlight 2-digit escape sequences the same
      as 1 or 3-digit escape sequences. (Closes: #775113)
  * Remove backported patches upstream/v7-4-576.patch and
  * Add a Build-Conflict for autoconf2.13 to avoid a FTBFS if it's installed.
    (Closes: #781031)

2206e3f... by James McCoy on 2015-03-31

Import patches-unapplied version 2:7.4.488-7 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 93dd597d6c0b84b183849f917b340802b43d617f

New changelog entries:
  * Backport patch 7.4.576 to fix jarring toggling of 'linebreak' option when
    using the c command to change the buffer. (Closes: #774492)
  * Backport upstream fix for call to unknown function in NetRW plugin.
    (Closes: #768467)