diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2018-06-29 10:17:46 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2018-06-29 10:17:46 +0200 |
| commit | 45390596e6d59e14c8f9c0596aeb4f4141d0c1e8 (patch) | |
| tree | f232017bd1543efebd282b33c300989d76df5ddc /lisp | |
| parent | b2c854a0e1364eab11151da7fa7558053bc834c4 (diff) | |
| download | emacs-45390596e6d59e14c8f9c0596aeb4f4141d0c1e8.tar.gz | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 25 | ||||
| -rw-r--r-- | lisp/net/trampver.el | 6 |
2 files changed, 16 insertions, 15 deletions
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index a30d7ef7138..1f40339c271 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 46af51ebfdb..0b83afcc590 100644 --- 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))) |