[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master abe83f76de: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master abe83f76de: Merge from origin/emacs-28 |
Date: |
Sat, 1 Oct 2022 11:15:01 -0400 (EDT) |
branch: master
commit abe83f76de36bc3922b410f9872065fc3903738b
Merge: ced37a87e7 be3eac3929
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
Merge from origin/emacs-28
be3eac3929 ; * etc/NEWS: Fix typos.
99a8c53247 Fix connection property incompatibility in Tramp
# Conflicts:
# etc/NEWS
---
etc/NEWS.28 | 5 ++---
lisp/net/tramp.el | 5 +++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 6e5ddfa066..1edf4e85b0 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -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.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 55c7cd5f37..373392f7c8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -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"))))