From d756c4d5cbf8137480fb4fe00904700eb9ac5327 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Mon, 24 Sep 2018 18:00:00 +0000 Subject: 43531: Completion: Fix some false positives in the logic for "are these two candidates completions equivalent". --- ChangeLog | 6 ++++++ Src/Zle/compcore.c | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46c65d713..205cca392 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-09-30 Daniel Shahaf + + * 43531: Src/Zle/compcore.c: Completion: Fix some false + positives in the logic for "are these two candidates completions + equivalent". + 2018-09-28 Daniel Shahaf * 43570: Src/jobs.c: Start documenting jobs.c, in particular diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c index 8eca39447..0a454ad5f 100644 --- a/Src/Zle/compcore.c +++ b/Src/Zle/compcore.c @@ -3160,9 +3160,7 @@ matcheq(Cmatch a, Cmatch b) matchstreq(a->ppre, b->ppre) && matchstreq(a->psuf, b->psuf) && matchstreq(a->suf, b->suf) && - ((!a->disp && !b->disp && matchstreq(a->str, b->str)) || - (a->disp && b->disp && !strcmp(a->disp, b->disp) && - matchstreq(a->str, b->str))); + matchstreq(a->str, b->str); } /* Make an array from a linked list. The second argument says whether * -- cgit 1.4.1