From: Glenn Morris <rgm@gnu.org>
Date: Mon, 11 Oct 2021 15:22:00 +0000 (-0700)
Subject: Fix merge error for elisp-mode-tests.el
X-Git-Tag: emacs-29.0.90~3671^2~609
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c9a8805ea4cc8748fd21e6dd9ed9cc6fdf3f0871;p=emacs.git

Fix merge error for elisp-mode-tests.el

* test/lisp/progmodes/elisp-mode-tests.el (test-cl-flet-indentation):
Delete test mistakenly restored by merge conflict.
It seems this was deleted 2021-10-01 with incomplete log message
"Add more indentation tests".
---

diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el
index 4d339934f83..a16d2921ea8 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -1101,17 +1101,5 @@ evaluation of BODY."
                         (emacs-lisp-mode)
                         (indent-region (point-min) (point-max)))))
 
-(ert-deftest test-cl-flet-indentation ()
-  :expected-result :failed              ; FIXME: bug#9622
-  (should (equal
-           (with-temp-buffer
-             (emacs-lisp-mode)
-             (insert "(cl-flet ((bla (x)\n(* x x)))\n(bla 42))")
-             (indent-region (point-min) (point-max))
-             (buffer-string))
-           "(cl-flet ((bla (x)
-	    (* x x)))
-  (bla 42))")))
-
 (provide 'elisp-mode-tests)
 ;;; elisp-mode-tests.el ends here