[Emacs-diffs] master 4539059: Sync with Tramp 2.4.0

[Michael Albinus]

branch: master
commit 45390596e6d59e14c8f9c0596aeb4f4141d0c1e8
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Sync with Tramp 2.4.0
    
    * doc/misc/trampver.texi:
    * lisp/net/trampver.el: Change version to "2.4.0".
    
    * lisp/net/tramp-gvfs.el (tramp-gvfs-handler-mounted-unmounted):
    Ignore unknown GVFS methods.
    
    * test/lisp/net/tramp-tests.el (tramp-test42-asynchronous-requests):
    Tag as :unstable.
---
 doc/misc/trampver.texi       |  2 +-
 lisp/net/tramp-gvfs.el       | 25 +++++++++++++------------
 lisp/net/trampver.el         |  6 +++---
 test/lisp/net/tramp-tests.el |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index eef2d9b..6d02b04 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp GIT, the version number is auto-frobbed from
 @c configure.ac, so you should edit that file and run
 @c "autoconf && ./configure" to change the version number.
address@hidden trampver 2.4.0-pre
address@hidden trampver 2.4.0
 
 @c Other flags from configuration
 @set instprefix /usr/local
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index a30d7ef..1f40339 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1553,18 +1553,19 @@ file-notify events."
                user (url-user uri)
                host (url-host uri)
                port (url-portspec uri)))
-       (with-parsed-tramp-file-name
-           (tramp-make-tramp-file-name method user domain host port "") nil
-         (tramp-message
-          v 6 "%s %s"
-          signal-name (tramp-gvfs-stringify-dbus-message mount-info))
-         (tramp-flush-file-property v "/" "list-mounts")
-         (if (string-equal (downcase signal-name) "unmounted")
-             (tramp-flush-file-properties v "/")
-           ;; Set mountpoint and location.
-           (tramp-set-file-property v "/" "fuse-mountpoint" fuse-mountpoint)
-           (tramp-set-connection-property
-            v "default-location" default-location)))))))
+       (when (member method tramp-gvfs-methods)
+         (with-parsed-tramp-file-name
+             (tramp-make-tramp-file-name method user domain host port "") nil
+           (tramp-message
+            v 6 "%s %s"
+            signal-name (tramp-gvfs-stringify-dbus-message mount-info))
+           (tramp-flush-file-property v "/" "list-mounts")
+           (if (string-equal (downcase signal-name) "unmounted")
+               (tramp-flush-file-properties v "/")
+             ;; Set mountpoint and location.
+             (tramp-set-file-property v "/" "fuse-mountpoint" fuse-mountpoint)
+             (tramp-set-connection-property
+              v "default-location" default-location))))))))
 
 (when tramp-gvfs-enabled
   (dbus-register-signal
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 46af51eb..0b83afc 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <address@hidden>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.4.0-pre
+;; Version: 2.4.0
 
 ;; This file is part of GNU Emacs.
 
@@ -33,7 +33,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.4.0-pre"
+(defconst tramp-version "2.4.0"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -55,7 +55,7 @@
 ;; Check for Emacs version.
 (let ((x (if (>= emacs-major-version 24)
     "ok"
-  (format "Tramp 2.4.0-pre is not fit for %s"
+  (format "Tramp 2.4.0 is not fit for %s"
          (replace-regexp-in-string "\n" "" (emacs-version))))))
   (unless (string-equal "ok" x) (error "%s" x)))
 
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index f2d9b0a..504b0aa 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -4883,7 +4883,7 @@ Use the `ls' command."
   "Check parallel asynchronous requests.
 Such requests could arrive from timers, process filters and
 process sentinels.  They shall not disturb each other."
-  :tags '(:expensive-test)
+  :tags '(:expensive-test :unstable)
   (skip-unless (tramp--test-enabled))
   (skip-unless (tramp--test-sh-p))