Merge from origin/emacs-28

be3eac3929 ; * etc/NEWS: Fix typos.
99a8c53247 Fix connection property incompatibility in Tramp

# Conflicts:
#	etc/NEWS
This commit is contained in:
Stefan Kangas 2022-10-01 17:14:47 +02:00
commit abe83f76de
2 changed files with 7 additions and 3 deletions

View file

@ -30,12 +30,11 @@ with a prefix argument or by typing 'C-u C-h C-n'.
* Changes in Specialized Modes and Packages in Emacs 28.3
** 'native-comp-driver-options' on macOS
** 'native-comp-driver-options' on macOS.
The value of 'native-comp-driver-options' has been changed to contain
"-Wl,-w" to suppress warnings of the form
ld: warning: -undefined dynamic_lookup may not work with chained fixups
ld: warning: -undefined dynamic_lookup may not work with chained fixups
emitted during native compilation on macOS 12.6 with Xcode 14.

View file

@ -6124,6 +6124,11 @@ This handles also chrooted environments, which are not regarded as local."
(defun tramp-get-remote-tmpdir (vec)
"Return directory for temporary files on the remote host identified by VEC."
(with-tramp-connection-property (tramp-get-process vec) "remote-tmpdir"
;; Prior Tramp 2.5.3.2, the connection property "tmpdir" did exist
;; with a remote file name. This must be discarded. (Bug#57800)
(when-let ((tmpdir (tramp-get-connection-property vec "tmpdir" nil)))
(when (tramp-tramp-file-p tmpdir)
(tramp-flush-connection-property vec "tmpdir")))
(let ((dir
(tramp-make-tramp-file-name
vec (or (tramp-get-method-parameter vec 'tramp-tmpdir) "/tmp"))))