From 8106cb50f58ca9662b1add24afe03cb424b45225 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 2 Mar 2023 13:54:14 +0100 Subject: [PATCH] Tramp cleanup * lisp/net/tramp.el (tramp-handle-unlock-file): Raise a warning only when `create-lockfiles'. * test/lisp/net/tramp-tests.el (tramp-test26-file-name-completion): Extend test. --- lisp/net/tramp.el | 4 +++- test/lisp/net/tramp-tests.el | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 1b434a726a1..47173b95bea 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4791,7 +4791,9 @@ Do not set it manually, it is used buffer-local in `tramp-get-lock-pid'.") ;; Trigger the unlock error. (signal 'file-error `("Cannot remove lock file for" ,file))) ;; `userlock--handle-unlock-error' exists since Emacs 28.1. - (error (tramp-compat-funcall 'userlock--handle-unlock-error err)))) + (error + (when create-lockfiles + (tramp-compat-funcall 'userlock--handle-unlock-error err))))) (defun tramp-handle-load (file &optional noerror nomessage nosuffix must-suffix) "Like `load' for Tramp files." diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 948bf0ab9e2..b6ad2e2f219 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -4590,6 +4590,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (should (equal (file-name-completion "foo" tmp-name) t)) (should (equal (file-name-completion "b" tmp-name) "bo")) (should-not (file-name-completion "a" tmp-name)) + ;; `file-name-completion' should not err out if + ;; directory does not exist. (Bug#61890) + (should-not + (file-name-completion + "a" (tramp-compat-file-name-concat tmp-name "fuzz"))) ;; Ange-FTP does not support predicates. (unless (tramp--test-ange-ftp-p) (should -- 2.39.5