Merge from origin/emacs-29

861556c1339 Fix minibuffer-completion tests
c0578edc8fc ; * doc/misc/eglot.texi (Troubleshooting Eglot): Fix typo...
c6bbf9cc270 Add c-ts-mode tests
a760364f5f3 Fix c-ts-mode--fill-paragraph
2a2b1d09ac7 Fix minor issues with 'pp' and related commands
dfb38fb2ee6 ; Improve documentation of tree-sitter node comparison
e8a89a18b69 ; Fix non-tree-sitter builds
f27a330b99e ; Fix typo in ert-with-temp-file
956889d8ff1 Equal now recognizes tree-sitter nodes (bug#60659)
8f446c2d397 Fix c-ts-mode comment indentation (bug#60270)
083badc9c12 * lisp/subr.el (while-let): Use if-let, not if-let* (bug#...
9ecebcdded1 * lisp/simple.el (next-completion): Handle first completi...
cfd2b3504ab Fix encoding with 'utf-8-auto'
53b47df8229 Report cursor correctly on PGTK when there is a margin

# Conflicts:
#	etc/NEWS

1 files changed, 15 insertions, 15 deletions

diff --git a/test/src/coding-tests.el b/test/src/coding-tests.el
index 6bd8d1ae6c4..b27907027ba 100644
--- a/test/src/coding-tests.el
+++ b/test/src/coding-tests.el
@@ -148,21 +148,21 @@
 
 (defun coding-tests (content-type write-coding read-coding detected-coding
                                    &optional translator)
-  (prefer-coding-system 'utf-8-auto)
-  (let ((filename (coding-tests-filename content-type write-coding)))
-    (with-temp-buffer
-      (let ((coding-system-for-read read-coding)
-            (contents (coding-tests-file-contents content-type))
-            (disable-ascii-optimization nil))
-        (if translator
-            (setq contents (funcall translator contents)))
-        (insert-file-contents filename)
-        (if (and (coding-system-equal buffer-file-coding-system detected-coding)
-                 (string= (buffer-string) contents))
-            nil
-          (list buffer-file-coding-system
-                (string-to-list (buffer-string))
-                (string-to-list contents)))))))
+  (with-coding-priority '(utf-8-auto)
+    (let ((filename (coding-tests-filename content-type write-coding)))
+      (with-temp-buffer
+        (let ((coding-system-for-read read-coding)
+              (contents (coding-tests-file-contents content-type))
+              (disable-ascii-optimization nil))
+          (if translator
+              (setq contents (funcall translator contents)))
+          (insert-file-contents filename)
+          (if (and (coding-system-equal buffer-file-coding-system detected-coding)
+                   (string= (buffer-string) contents))
+              nil
+            (list buffer-file-coding-system
+                  (string-to-list (buffer-string))
+                  (string-to-list contents))))))))
 
 (ert-deftest ert-test-coding-ascii ()
   (unwind-protect