Merge from origin/emacs-31

c3babe4b896 Fix lax whitespace highlight during query-replace
2e70b88623e Fix fill-paragraph combining text with preceding comment
ea54c33950f ; * etc/PROBLEMS: Link to bug#81124.
02897e208d0 emacsclient quote_argument is void
c6181780663 ; Mark process-test-stderr-buffer as :unstable when runni...
2c1b45f5c56 ; Improve documentation of 'vc-dir-auto-hide-up-to-date'
768c8bf0045 Revert "* admin/notes/documentation: Recommend not using ...
a7414f18598 native--compile-skip-on-battery-p: Try to fix ?b, ?B cond...
7cee526a8cc Save and restore original local keymap in grep-edit-mode
4d87d203cfb Fix display of inline SVG images in Rmail
4c55d04ebe3 Add treesit-ready-p check back to tree-sitter major modes...
7892ae5eaf4 Fix pathological slowness in flex completion
12eec781ed6 No longer raise error on HTTP 402 (Payment Required) (bug...
1800350b186 Avoid compilation-mode matching rust as gnu

3 files changed, 42 insertions, 0 deletions

diff --git a/test/lisp/textmodes/fill-resources/fill-paragraph-handle-comment.erts b/test/lisp/textmodes/fill-resources/fill-paragraph-handle-comment.erts
new file mode 100644
index 00000000000..c7c9e96ea50
--- /dev/null
+++ b/test/lisp/textmodes/fill-resources/fill-paragraph-handle-comment.erts
@@ -0,0 +1,37 @@
+Point-Char: |
+
+Name: fill-paragraph-handle-comment - non-comment line before comment line
+Code:
+  (lambda ()
+    (setq-local comment-start "# ")
+    (setq-local fill-paragraph-handle-comment t)
+    (setq-local fill-column 42)
+    (fill-paragraph))
+
+=-=
+
+this is not part of the comment this is not part of the comment|
+# this is a comment this is a comment this is a comment
+
+=-=
+
+this is not part of the comment this is
+not part of the comment
+# this is a comment this is a comment this is a comment
+
+=-=-=
+
+Name: fill-paragraph-handle-comment - non-comment line after comment line
+
+=-=
+
+# this is a comment this is a comment this is a comment
+this is not part of the comment this is not part of the comment|
+
+=-=
+
+# this is a comment this is a comment this is a comment
+this is not part of the comment this is
+not part of the comment
+
+=-=-=
diff --git a/test/lisp/textmodes/fill-tests.el b/test/lisp/textmodes/fill-tests.el
index 2bb9d3ea163..c37a879b4b2 100644
--- a/test/lisp/textmodes/fill-tests.el
+++ b/test/lisp/textmodes/fill-tests.el
@@ -163,6 +163,10 @@ eius. Foo")))
   (skip-unless (functionp 'markdown-mode))
   (ert-test-erts-file (ert-resource-file "fill-paragraph-semlf-markdown-mode.erts")))
 
+(ert-deftest fill-test-fill-paragraph-handle-comment ()
+  "Test the `fill-paragraph-handle-comment' variable."
+  (ert-test-erts-file (ert-resource-file "fill-paragraph-handle-comment.erts")))
+
 (provide 'fill-tests)
 
 ;;; fill-tests.el ends here
diff --git a/test/src/process-tests.el b/test/src/process-tests.el
index 3048cada03d..9b964e41995 100644
--- a/test/src/process-tests.el
+++ b/test/src/process-tests.el
@@ -89,6 +89,7 @@ process to complete."
         (should (string= (buffer-string) "arg1=\"x &y\", arg2=\n"))))))
 
 (ert-deftest process-test-stderr-buffer ()
+  :tags (if (getenv "EMACS_EMBA_CI") '(:unstable))
   (skip-unless (executable-find "bash"))
   (with-timeout (60 (ert-fail "Test timed out"))
   (let* ((stdout-buffer (generate-new-buffer "*stdout*"))