[meld: 16/16] Merge branch 'precommit'

[Kai Willadsen <kaiw src gnome org>]

commit 78612040ff91037c40c37548925f392e6981d48d
Merge: c931d532 f072407a
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Oct 6 08:50:36 2019 +1000

    Merge branch 'precommit'

 .gitlab-ci.yml                     | 10 +++++-----
 .pre-commit-config.yaml            | 38 ++++++++++++++++++++++++++++++++++++++
 bin/meld                           |  4 ++--
 dev-requirements.txt               |  3 ++-
 gettext/its/mime.its               |  1 -
 gettext/its/mime.loc               |  1 -
 help/C/buildwebhelp.py             |  1 -
 help/C/file-filters.page           |  2 --
 help/C/flattened-view.page         |  2 --
 help/C/keyboard-shortcuts.page     |  1 -
 help/LINGUAS                       |  2 +-
 maint                              |  4 ++--
 meld/actiongutter.py               |  5 +----
 meld/chunkmap.py                   |  4 +---
 meld/diffgrid.py                   |  4 +---
 meld/dirdiff.py                    | 14 ++++++--------
 meld/filediff.py                   | 25 ++++++++++++++-----------
 meld/gutterrendererchunk.py        |  4 +---
 meld/iohelpers.py                  |  4 +---
 meld/linkmap.py                    |  4 +---
 meld/matchers/diffutil.py          |  7 +++++--
 meld/matchers/helpers.py           |  1 -
 meld/matchers/merge.py             |  5 ++---
 meld/meldapp.py                    |  5 +----
 meld/meldbuffer.py                 |  5 +----
 meld/melddoc.py                    |  6 +-----
 meld/meldwindow.py                 |  7 ++-----
 meld/misc.py                       |  5 ++---
 meld/newdifftab.py                 |  5 +----
 meld/patchdialog.py                |  6 +-----
 meld/preferences.py                |  6 +-----
 meld/recent.py                     |  4 +---
 meld/resources/gtk/help-overlay.ui |  1 -
 meld/settings.py                   |  5 +----
 meld/sourceview.py                 |  8 +-------
 meld/style.py                      | 11 +++--------
 meld/tree.py                       | 28 ++++++++++++++++++++--------
 meld/ui/bufferselectors.py         |  4 +---
 meld/ui/cellrenderers.py           |  3 +--
 meld/ui/emblemcellrenderer.py      |  5 +----
 meld/ui/filechooser.py             |  4 +---
 meld/ui/findbar.py                 |  4 +---
 meld/ui/historyentry.py            |  5 +----
 meld/ui/notebook.py                |  5 +----
 meld/ui/notebooklabel.py           |  4 +---
 meld/ui/recentselector.py          |  3 +--
 meld/ui/statusbar.py               |  8 ++------
 meld/ui/util.py                    |  4 +---
 meld/ui/vcdialogs.py               |  5 +----
 meld/undo.py                       |  1 -
 meld/vc/_vc.py                     |  3 +--
 meld/vc/cvs.py                     |  1 -
 meld/vc/git.py                     |  1 -
 meld/vcview.py                     |  7 +------
 meld/windowstate.py                |  1 -
 meson_post_install.py              |  2 +-
 po/dz.po                           |  1 -
 po/en_CA.po                        |  4 ++--
 po/fr.po                           |  4 ++--
 po/ko.po                           |  4 ++--
 po/ne.po                           |  1 -
 po/pa.po                           |  1 -
 po/uk.po                           |  1 -
 setup.cfg                          | 20 +++++++++++++++++---
 test/conftest.py                   |  2 +-
 test/test_buffer_lines.py          |  1 -
 test/test_matchers.py              | 16 +++++++---------
 test/test_misc.py                  |  1 +
 68 files changed, 167 insertions(+), 207 deletions(-)
---