From: Mark Thom <markjordanthom@gmail.com>
Date: Mon, 4 May 2020 05:36:26 +0000 (-0600)
Subject: merge
X-Git-Tag: v0.8.123~57^2~16
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=407094cdcb4da8448e40df695baf38667069deb1;p=scryer-prolog.git

merge
---

407094cdcb4da8448e40df695baf38667069deb1
diff --cc src/prolog/toplevel.pl
index 0e571189,9e457395..6bece860
--- a/src/prolog/toplevel.pl
+++ b/src/prolog/toplevel.pl
@@@ -295,10 -295,10 +295,10 @@@ gather_query_vars([], [])
  
  is_a_different_variable([_ = Binding | Pairs], Value) :-
      (  Value == Binding, !
-     ;  is_a_different_variable(Pairs, Var)
+     ;  is_a_different_variable(Pairs, Value)
      ).
  
 -eq_member(X, [Y|_]) :- X == Y, !.
 +eq_member(X, [Y|_])  :- X == Y, !.
  eq_member(X, [_|Ys]) :- eq_member(X, Ys).
  
  gather_equations([], _, Goals, Goals).