From f37454c042f262c4fda9e122cc39e43a5e286565 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 29 Aug 2023 07:40:19 +1000 Subject: [PATCH] mergeview: fix uninitialised-var error Forgot to make sure 'diff' was set. Signed-off-by: NeilBrown --- python/lib-mergeview.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python/lib-mergeview.py b/python/lib-mergeview.py index 5de79fd5..442371e8 100644 --- a/python/lib-mergeview.py +++ b/python/lib-mergeview.py @@ -100,6 +100,8 @@ class MergePane(edlib.Pane): diff = focus.call("copy:get", ret='str') if not diff or not diff.startswith("|||||||"): diff = None + else: + diff = None if diff: # selection must be full lines focus.call("doc:EOL", -1, pt) -- 2.39.5