From 0ae1f5909d1633894a38f395de74aecacff1d9fa Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sat, 16 Sep 2017 14:41:37 +0200 Subject: [PATCH] Strip the old text for configdiff This means we don't report an unneeded whitespace hunk anymore. --- qutebrowser/config/configdiff.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qutebrowser/config/configdiff.py b/qutebrowser/config/configdiff.py index 16a8e5144..3f07daba1 100644 --- a/qutebrowser/config/configdiff.py +++ b/qutebrowser/config/configdiff.py @@ -742,8 +742,10 @@ def get_diff(): continue dest.append(line.rstrip()) - conf_delta = difflib.unified_diff(OLD_CONF.splitlines(), old_conf_lines) - key_delta = difflib.unified_diff(OLD_KEYS_CONF.splitlines(), old_key_lines) + conf_delta = difflib.unified_diff(OLD_CONF.lstrip().splitlines(), + old_conf_lines) + key_delta = difflib.unified_diff(OLD_KEYS_CONF.lstrip().splitlines(), + old_key_lines) conf_diff = '\n'.join(conf_delta) key_diff = '\n'.join(key_delta)