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.

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index eef2d9b6907f04c60dd03c87c1f6a58f7117656e..6d02b043b64f923a220d119338fb8ea563b0020f 100644 (file)
--- 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.
-@set trampver 2.4.0-pre
+@set 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 a30d7ef71387c458316b272998116feafb35efcd..1f40339c27104b77ddb134c737f0f8232d2642a4 100644 (file)
--- 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 46af51ebfdb337b24e4ce42447db20b6fe7edb45..0b83afcc5902715ec255418eec67a481b0429663 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -7,7 +7,7 @@
 ;; Maintainer: Michael Albinus <michael.albinus@gmx.de>
 ;; 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 f2d9b0ab47ef2cd36b603fdb3582e58b3cf1bff3..504b0aae785b8a8b988cd290ece3b672a871f1ec 100644 (file)
--- 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))