From 8227d1273e2b82dbed14c0cba06959083d377745 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 20 Oct 2021 14:16:07 +0200 Subject: Fix bug with string values in equal-including-properties * src/intervals.c (intervals_equal_1): Factor out from intervals_equal. Optionally use Fequal for comparison of string values in property lists. (intervals_equal): Update for the above. (compare_string_intervals): Use the above optional Fequal comparison to fix a bug where 'equal-including-properties' compared strings with eq, instead of equal. (Bug#6581) * test/src/fns-tests.el (fns-tests-equal-including-properties) (fns-tests-equal-including-properties/string-prop-vals): New tests. * test/lisp/emacs-lisp/ert-tests.el (ert-test-equal-including-properties): Remove parts testing 'equal-including-properties'. * lisp/emacs-lisp/ert.el (ert-equal-including-properties): Add FIXME that this should be removed. --- lisp/emacs-lisp/ert.el | 1 + 1 file changed, 1 insertion(+) (limited to 'lisp/emacs-lisp/ert.el') diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index efc1825017b..f7cf1e4289a 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -92,6 +92,7 @@ Use nil for no limit (caution: backtrace lines can be very long)." ;;; Copies/reimplementations of cl functions. +;; FIXME: Bug#6581 is fixed, so this should be deleted. (defun ert-equal-including-properties (a b) "Return t if A and B have similar structure and contents. -- cgit v1.2.3