diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-05-20 19:06:42 +0100 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2020-05-20 19:06:42 +0100 |
| commit | 95e7ba3abd507a911e626d15bc89cac5a4b98157 (patch) | |
| tree | 5e1db464ca50fe9a8b5975677a875d8ed8c75a14 /patches/tramp-detect-wrapped-gvfsd.patch | |
| parent | 6dae7cbd82e265f8957743f39e22b9c0c3bc9b22 (diff) | |
| download | nixlib-95e7ba3abd507a911e626d15bc89cac5a4b98157.tar nixlib-95e7ba3abd507a911e626d15bc89cac5a4b98157.tar.gz nixlib-95e7ba3abd507a911e626d15bc89cac5a4b98157.tar.bz2 nixlib-95e7ba3abd507a911e626d15bc89cac5a4b98157.tar.lz nixlib-95e7ba3abd507a911e626d15bc89cac5a4b98157.tar.xz nixlib-95e7ba3abd507a911e626d15bc89cac5a4b98157.tar.zst nixlib-95e7ba3abd507a911e626d15bc89cac5a4b98157.zip | |
Bump emacs master & fix gvfs patch
Diffstat (limited to 'patches/tramp-detect-wrapped-gvfsd.patch')
| -rw-r--r-- | patches/tramp-detect-wrapped-gvfsd.patch | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/patches/tramp-detect-wrapped-gvfsd.patch b/patches/tramp-detect-wrapped-gvfsd.patch index 307ef9af0106..7bde14beaf11 100644 --- a/patches/tramp-detect-wrapped-gvfsd.patch +++ b/patches/tramp-detect-wrapped-gvfsd.patch @@ -1,14 +1,12 @@ diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el -index 3ce7bbbd4a..e31059da3f 100644 +index 704d65cd55..47c027e255 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el -@@ -125,7 +125,8 @@ - (autoload 'zeroconf-init "zeroconf") - (tramp-compat-funcall 'dbus-get-unique-name :system) - (tramp-compat-funcall 'dbus-get-unique-name :session) -- (or (tramp-process-running-p "gvfs-fuse-daemon") -+ (or (tramp-process-running-p ".gvfsd-fuse-wrapped") -+ (tramp-process-running-p "gvfs-fuse-daemon") +@@ -129,6 +129,7 @@ + ;; for some processes. Better we don't check. + (<= emacs-major-version 25) + (tramp-process-running-p "gvfs-fuse-daemon") ++ (tramp-process-running-p ".gvfsd-fuse-wrapped") (tramp-process-running-p "gvfsd-fuse")))) "Non-nil when GVFS is available.") |