Merge from origin/emacs-29

c42970d7758 Handle last-coding-system-used in Tramp for all backends
ffafe38d030 Add 2 Welsh characters to iso-transl.el

diff --cc lisp/net/tramp-adb.el
Simple merge

diff --cc lisp/net/tramp-sh.el
index 2b1d26dd232888bc84a1cbe7eefbf19f8889c3c8,ffd910b41c4b6dc30e52b72fdccc66aa86173528..d836fb1f38759affb53564a87232801da8ac17c5
--- 1/lisp/net/tramp-sh.el
--- 2/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@@ -3614,47 -3609,8 +3605,43 @@@ implementation will be used.
               v 'file-error
               (concat "Method `%s' should specify both encoding and "
                       "decoding command or an scp program")
-              method))))
- 
-         ;; Make `last-coding-system-used' have the right value.
-         (when coding-system-used
-           (setq last-coding-system-used coding-system-used)))))))
+              method)))))))))
  
 +(defun tramp-bundle-read-file-names (vec files)
 +  "Read file attributes of FILES and with one command fill the cache.
 +FILES must be the local names only.  The cache attributes to be
 +filled are described in `tramp-bundle-read-file-names'."
 +  (when files
 +    (tramp-maybe-send-script
 +     vec
 +     (format tramp-bundle-read-file-names
 +           (tramp-get-file-exists-command vec)
 +           (format "%s -r" (tramp-get-test-command vec))
 +           (format "%s -d" (tramp-get-test-command vec)))
 +     "tramp_bundle_read_file_names")
 +
 +    (dolist
 +      (elt
 +       (ignore-errors
 +         ;; We cannot use `tramp-send-command-and-read', because
 +         ;; this does not cooperate well with heredoc documents.
 +         (tramp-send-command
 +          vec
 +          (format
 +           "tramp_bundle_read_file_names <<'%s'\n%s\n%s\n"
 +           tramp-end-of-heredoc
 +           (mapconcat #'tramp-shell-quote-argument
 +                      files
 +                      "\n")
 +           tramp-end-of-heredoc))
 +         (with-current-buffer (tramp-get-connection-buffer vec)
 +           ;; Read the expression.
 +           (goto-char (point-min))
 +           (read (current-buffer)))))
 +
 +      (tramp-set-file-property
 +       vec (car elt) (cadr elt) (cadr (cdr elt))))))
 +
  (defvar tramp-vc-registered-file-names nil
    "List used to collect file names, which are checked during `vc-registered'.")
  

diff --cc lisp/net/tramp-smb.el
Simple merge

diff --cc lisp/net/tramp-sshfs.el
Simple merge

diff --cc lisp/net/tramp.el
Simple merge