From 30692f16b1527b364f2b5a242c67e54c0fa83328 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 4 Apr 2023 13:37:18 +0200 Subject: [PATCH] Improve Tramp robustness * lisp/net/tramp-sh.el (tramp-open-connection-setup-interactive-shell): Check for `tramp-string-empty-or-nil-p'. --- lisp/net/tramp-sh.el | 2 +- lisp/net/tramp.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 2ef97d540a0..2df3006c1d9 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -4496,7 +4496,7 @@ process to set up. VEC specifies the connection." ;; Set `remote-tty' process property. (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"" 'noerror))) - (unless (string-empty-p tty) + (unless (tramp-string-empty-or-nil-p tty) (process-put proc 'remote-tty tty) (tramp-set-connection-property proc "remote-tty" tty))) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index eb4cb9ce082..3420bb76d14 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4793,7 +4793,7 @@ Do not set it manually, it is used buffer-local in `tramp-get-lock-pid'.") (signal 'file-error `("Cannot remove lock file for" ,file))) ;; `userlock--handle-unlock-error' exists since Emacs 28.1. It ;; checks for `create-lockfiles' since Emacs 30.1, we don't need - ;; this chweck here, then. + ;; this check here, then. (error (unless (or (not create-lockfiles) (bound-and-true-p remote-file-name-inhibit-locks)) (tramp-compat-funcall 'userlock--handle-unlock-error err))))) -- 2.39.5