[elpa] externals/company 6ff9f054cb 22/24: More fixing of tests

[ELPA Syncer]

branch: externals/company
commit 6ff9f054cbcfd26b538913552eb352fa4d8ce2a7
Author: Dmitry Gutov <dmitry@gutov.dev>
Commit: Dmitry Gutov <dmitry@gutov.dev>

    More fixing of tests
---
 company.el              | 3 ++-
 test/frontends-tests.el | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/company.el b/company.el
index 2209d950cd..a3a92b481d 100644
--- a/company.el
+++ b/company.el
@@ -2909,7 +2909,8 @@ from the candidates list.")
           ;; `display-line-numbers-mode' is enabled in internal buffers
           ;; that breaks width calculation, so need to disable (bug#59311)
           (when (bound-and-true-p display-line-numbers-mode)
-            (display-line-numbers-mode -1))
+            (with-no-warnings ;; Emacs 25
+              (display-line-numbers-mode -1)))
           (delete-region (point-min) (point-max))
           (insert string)
           (let ((wb (window-buffer)))
diff --git a/test/frontends-tests.el b/test/frontends-tests.el
index d1d0478385..c3fe3c38a4 100644
--- a/test/frontends-tests.el
+++ b/test/frontends-tests.el
@@ -483,8 +483,10 @@
     (should (equal-including-properties
              (company-modify-line str "xx" 0)
              "xx-foobar"))
-    ;; `equal-including-properties' compares with `eq' in Emacs 28-.
-    (should (ert-equal-including-properties
+    (should (funcall
+             (if (version< emacs-version "29")
+                 #'ert-equal-including-properties
+               #'equal-including-properties)
              (company-modify-line str "zz" (* 10 (frame-char-width)))
              (concat "-*-foobar"
                      (propertize " " 'display `(space :width 
(,(frame-char-width))))