Merge from origin/emacs-29

4767f5eaeed Better fix for bug#65156
dd1d8414b33 Fix insert-file-contents with pipes and /dev/stdin
50649a6d1a2 ; * etc/PROBLEMS: Fix wording.
f0dda682ffb ; * etc/NEWS.28: Add deletion of levents.el.
f4acae842c0 Fix bug#65042
e1874c4e8bf * configure.ac (HAVE_TREE_SITTER): Set NEED_DYNLIB=yes (b...
ef8838c3a5f * etc/NEWS: Mention tramp-show-ad-hoc-proxies.
495bee253fc * test/lisp/net/tramp-tests.el (tramp-test42-utf8): Skip ...
de1effd73b4 ; Fix last change
7c7966862bc * test/lisp/net/tramp-tests.el (tramp-test10-write-region...
16205e8db65 ; Improve help-echo in package.el
a95e7006989 ; Filter packages available for upgrade via menu bar
adff72dd1d2 Fix reverting Rmail buffers

1 files changed, 19 insertions, 8 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index b1d39c413dc..fa68372143c 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2711,7 +2711,20 @@ This checks also `file-name-as-directory', `file-name-directory',
              :type 'file-already-exists)
             (should-error
              (write-region "foo" nil tmp-name nil nil nil 'excl)
-             :type 'file-already-exists))
+             :type 'file-already-exists)
+            (delete-file tmp-name)
+
+            ;; Check `buffer-file-coding-system'.  Bug#65022.
+            (with-temp-buffer
+              (setq buffer-file-name tmp-name)
+              (insert "foo")
+              (set-buffer-file-coding-system 'cp1251)
+              (let ((bfcs buffer-file-coding-system))
+                (should (buffer-modified-p))
+                (should (null (save-buffer)))
+                (should
+                 (eq (coding-system-get buffer-file-coding-system :mime-charset)
+                     (coding-system-get bfcs :mime-charset))))))
 
         ;; Cleanup.
         (ignore-errors (delete-file tmp-name))))))
@@ -7473,14 +7486,12 @@ This requires restrictions of file name syntax."
   (skip-unless (not (tramp--test-gdrive-p)))
   (skip-unless (not (tramp--test-crypt-p)))
   (skip-unless (not (tramp--test-rclone-p)))
+  (skip-unless (not (or (eq system-type 'darwin) (tramp--test-macos-p))))
 
-  (let* ((utf8 (if (and (eq system-type 'darwin)
-                        (memq 'utf-8-hfs (coding-system-list)))
-                   'utf-8-hfs 'utf-8))
-         (coding-system-for-read utf8)
-         (coding-system-for-write utf8)
-         (file-name-coding-system
-          (coding-system-change-eol-conversion utf8 'unix)))
+  (let ((coding-system-for-read 'utf-8)
+        (coding-system-for-write 'utf-8)
+        (file-name-coding-system
+         (coding-system-change-eol-conversion 'utf-8 'unix)))
     (apply
      #'tramp--test-check-files
      (append