From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 25 Jan 2020 18:25:00 +0000 (+0100)
Subject: Fix Bug#39279
X-Git-Tag: emacs-28.0.90~7908^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5ba6df774eef64fc6e2cd962f8502a8d371ed85a;p=emacs.git

Fix Bug#39279

* lisp/net/tramp.el (tramp-completion-file-name-handler):
Fix thinko.  (Bug#39279)
---

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 81c79bf5d7e..61f6f2ed3a7 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2412,10 +2412,11 @@ Fall back to normal file name handler if no Tramp file name handler exists."
 (defun tramp-completion-file-name-handler (operation &rest args)
   "Invoke Tramp file name completion handler for OPERATION and ARGS.
 Falls back to normal file name handler if no Tramp file name handler exists."
-  (when tramp-mode
-    (if-let ((fn (assoc operation tramp-completion-file-name-handler-alist)))
-	(save-match-data (apply (cdr fn) args))
-      (tramp-run-real-handler operation args))))
+  (if-let
+      ((fn (and tramp-mode
+		(assoc operation tramp-completion-file-name-handler-alist))))
+      (save-match-data (apply (cdr fn) args))
+    (tramp-run-real-handler operation args)))
 
 ;;;###autoload
 (progn (defun tramp-autoload-file-name-handler (operation &rest args)