From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 8 Feb 2024 10:17:22 +0000 (+0100)
Subject: `file-remote-p' must not return an error
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=18ae83e981c1d6574e2821907abba88786f8717d;p=emacs.git

`file-remote-p' must not return an error

* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler):
`file-remote-p' must not return an error.  (Bug#68976)

(cherry picked from commit 08c81db7c8e522278fb2c8de8fbe556d109c135f)
---

diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 72589e7ce4a..4e949e7e60b 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -888,7 +888,8 @@ Operations not mentioned here will be handled by the default Emacs primitives.")
   "Invoke the GVFS related OPERATION and ARGS.
 First arg specifies the OPERATION, second arg is a list of
 arguments to pass to the OPERATION."
-  (unless tramp-gvfs-enabled
+  ;; `file-remote-p' must not return an error.  (Bug#68976)
+  (unless (or tramp-gvfs-enabled (eq operation 'file-remote-p))
     (tramp-user-error nil "Package `tramp-gvfs' not supported"))
   (if-let ((filename (apply #'tramp-file-name-for-operation operation args))
            (tramp-gvfs-dbus-event-vector