[meld: 2/7] Merge branch 'master' into dirdiff.apply_text_filters

[Kai Willadsen <kaiw src gnome org>]

commit 83d33c7db0f009db6e302895bb36d29005e9aae8
Merge: 20a9846d bfb0eed3
Author: hugosenari <hugosenari gmail com>
Date:   Tue Jul 10 01:15:20 2018 -0300

    Merge branch 'master' into dirdiff.apply_text_filters

 appveyor.yml                            |  22 +--
 bin/meld                                |   8 +-
 meld/conf.py                            |   6 -
 meld/dirdiff.py                         |  18 +-
 po/cs.po                                | 299 +++++++++++++++++---------------
 setup_win32.py                          | 138 ++++++++-------
 test/dirdiff/test_remove_blank_lines.py |  29 ++++
 7 files changed, 287 insertions(+), 233 deletions(-)
---
diff --cc meld/dirdiff.py
index 8780707b,c6791683..6c9826ea
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@@ -184,14 -184,12 +184,14 @@@ def _files_same(files, regexes, compari
      if result == Different and need_contents:
          contents = [b"".join(c) for c in contents]
          # For probable text files, discard newline differences to match
-         # file comparisons.
-         contents = [b"\n".join(c.splitlines()) for c in contents]
+         if ignore_blank_lines:
+             contents = [remove_blank_lines(c) for c in contents]
+         else:
+             contents = [b"\n".join(c.splitlines()) for c in contents]
  
 -        contents = [misc.apply_text_filters(c, regexes) for c in contents]
 +        for regex in regexes:
 +            contents = (regex.sub(b'', c) for c in contents)
 +
-         if ignore_blank_lines:
-             contents = [remove_blank_lines(c) for c in contents]
          result = SameFiltered if all_same(contents) else Different
  
      _cache[cache_key] = CacheResult(stats, result)