Partially revert a fill-region-as-paragraph regression

* lisp/textmodes/fill.el (fill-region-as-paragraph): Revert
e186af261 (bug#53537), because it leads to regressions.  (But
leave tests in place.)

1 files changed, 23 insertions, 0 deletions

diff --git a/test/lisp/textmodes/fill-tests.el b/test/lisp/textmodes/fill-tests.el
index 39e5dd3d26c..8b9f144dfff 100644
--- a/test/lisp/textmodes/fill-tests.el
+++ b/test/lisp/textmodes/fill-tests.el
@@ -45,6 +45,8 @@
     (should (string= (buffer-string) "Abc\nd efg\n(h ijk)."))))
 
 (ert-deftest fill-test-unbreakable-paragraph ()
+  ;; See bug#45720 and bug#53537.
+  :expected-result :failed
   (with-temp-buffer
     (let ((string "aaa =   baaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"))
       (insert string)
@@ -76,6 +78,27 @@
                (buffer-string)
                "aaa =   baaaaaaaa aaaaaaaaaa\n         aaaaaaaaaa\n")))))
 
+(ert-deftest test-fill-haskell ()
+  (should
+   (equal
+    (with-temp-buffer
+      (asm-mode)
+      (dolist (line '("  ;; a b c"
+                      "  ;; d e f"
+                      "  ;; x y z"
+                      "  ;; w"))
+        (insert line "\n"))
+      (goto-char (point-min))
+      (end-of-line)
+      (setf fill-column 10)
+      (fill-paragraph nil)
+      (buffer-string))
+    "  ;; a b c
+  ;; d e f
+  ;; x y z
+  ;; w
+")))
+
 (provide 'fill-tests)
 
 ;;; fill-tests.el ends here