From c9a8805ea4cc8748fd21e6dd9ed9cc6fdf3f0871 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 11 Oct 2021 08:22:00 -0700 Subject: [PATCH] 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". --- test/lisp/progmodes/elisp-mode-tests.el | 12 ------------ 1 file changed, 12 deletions(-) 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 -- 2.39.2