From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 21 Sep 2020 22:54:54 +0000 (+0200)
Subject: Remove some unnecessary compat code
X-Git-Tag: emacs-28.0.90~5943
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a3a2a00dac62609ff32caa9c3dbe8c97f4918ef;p=emacs.git

Remove some unnecessary compat code

* test/lisp/emacs-lisp/ert-x-tests.el (ert-test-describe-test):
* test/lisp/wdired-tests.el (wdired-test-unfinished-edit-01):
Remove unnecessary compat code; these tests should never need to run
on older versions of Emacs.
---

diff --git a/test/lisp/emacs-lisp/ert-x-tests.el b/test/lisp/emacs-lisp/ert-x-tests.el
index b760f8c7869..f342bff0472 100644
--- a/test/lisp/emacs-lisp/ert-x-tests.el
+++ b/test/lisp/emacs-lisp/ert-x-tests.el
@@ -187,18 +187,15 @@
   "Tests `ert-describe-test'."
   (save-window-excursion
     (ert-with-buffer-renamed ("*Help*")
-      (if (< emacs-major-version 24)
-          (should (equal (should-error (ert-describe-test 'ert-describe-test))
-                         '(error "Requires Emacs 24")))
-        (ert-describe-test 'ert-test-describe-test)
-        (with-current-buffer "*Help*"
-          (let ((case-fold-search nil))
-            (should (string-match (concat
-                                   "\\`ert-test-describe-test is a test"
-                                   " defined in"
-                                   " ['`‘]ert-x-tests.elc?['’]\\.\n\n"
-                                   "Tests ['`‘]ert-describe-test['’]\\.\n\\'")
-                                  (buffer-string)))))))))
+      (ert-describe-test 'ert-test-describe-test)
+      (with-current-buffer "*Help*"
+        (let ((case-fold-search nil))
+          (should (string-match (concat
+                                 "\\`ert-test-describe-test is a test"
+                                 " defined in"
+                                 " ['`‘]ert-x-tests.elc?['’]\\.\n\n"
+                                 "Tests ['`‘]ert-describe-test['’]\\.\n\\'")
+                                (buffer-string))))))))
 
 (ert-deftest ert-test-message-log-truncation ()
   :tags '(:causes-redisplay)
diff --git a/test/lisp/wdired-tests.el b/test/lisp/wdired-tests.el
index 96e88f62fec..b89e8c876e2 100644
--- a/test/lisp/wdired-tests.el
+++ b/test/lisp/wdired-tests.el
@@ -106,7 +106,6 @@ only the name before the link arrow."
   "Test editing a file name without saving the change.
 Finding the new name should be possible while still in
 wdired-mode."
-  :expected-result (if (< emacs-major-version 27) :failed :passed)
   (let* ((test-dir (make-temp-file "test-dir-" t))
 	 (test-file (concat (file-name-as-directory test-dir) "foo.c"))
 	 (replace "bar")