diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-02-28 04:20:00 -0500 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2020-02-28 04:20:00 -0500 |
| commit | 7c65cc1f93947e0cf2de27f14b29d2b48147675e (patch) | |
| tree | a964ad633c8b7867b52bca244bbeecb05481bd6b /patches/tramp-detect-wrapped-gvfsd.patch | |
| parent | 1ac345a32c97849c2b11b6870c9ade38cf9f0bd5 (diff) | |
| download | nixlib-7c65cc1f93947e0cf2de27f14b29d2b48147675e.tar nixlib-7c65cc1f93947e0cf2de27f14b29d2b48147675e.tar.gz nixlib-7c65cc1f93947e0cf2de27f14b29d2b48147675e.tar.bz2 nixlib-7c65cc1f93947e0cf2de27f14b29d2b48147675e.tar.lz nixlib-7c65cc1f93947e0cf2de27f14b29d2b48147675e.tar.xz nixlib-7c65cc1f93947e0cf2de27f14b29d2b48147675e.tar.zst nixlib-7c65cc1f93947e0cf2de27f14b29d2b48147675e.zip | |
Update gvfsd patch
TRAMP removed `tramp-compat-process-running-p`. See: https://github.com/emacs-mirror/emacs/commit/d3ead375092e2690c1d1d6a5dd82e6e89cdf4f4c
Diffstat (limited to 'patches/tramp-detect-wrapped-gvfsd.patch')
| -rw-r--r-- | patches/tramp-detect-wrapped-gvfsd.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/tramp-detect-wrapped-gvfsd.patch b/patches/tramp-detect-wrapped-gvfsd.patch index 5d16194fd202..307ef9af0106 100644 --- a/patches/tramp-detect-wrapped-gvfsd.patch +++ b/patches/tramp-detect-wrapped-gvfsd.patch @@ -1,14 +1,14 @@ diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el -index f370abba31..f2806263a9 100644 +index 3ce7bbbd4a..e31059da3f 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el -@@ -164,7 +164,8 @@ tramp-gvfs-enabled - (and (featurep 'dbusbind) +@@ -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-compat-process-running-p "gvfs-fuse-daemon") -+ (or (tramp-compat-process-running-p ".gvfsd-fuse-wrapped") -+ (tramp-compat-process-running-p "gvfs-fuse-daemon") - (tramp-compat-process-running-p "gvfsd-fuse")))) +- (or (tramp-process-running-p "gvfs-fuse-daemon") ++ (or (tramp-process-running-p ".gvfsd-fuse-wrapped") ++ (tramp-process-running-p "gvfs-fuse-daemon") + (tramp-process-running-p "gvfsd-fuse")))) "Non-nil when GVFS is available.") |