aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/net/tramp-gvfs.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1cc71bed1f8..a259288e985 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12012-04-02 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-gvfs.el (tramp-gvfs-send-command): Apply
4 `tramp-compat-call-process' instead of `tramp-local-call-process'.
5 Reported by Magnus Henoch <magnus.henoch@gmail.com>.
6
12012-04-01 Chong Yidong <cyd@gnu.org> 72012-04-01 Chong Yidong <cyd@gnu.org>
2 8
3 * files.el (file-in-directory-p): Rename from file-subdir-of-p. 9 * files.el (file-in-directory-p): Rename from file-subdir-of-p.
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 396443e60e6..6f3c5e04236 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1267,7 +1267,7 @@ COMMAND is usually a command from the gvfs-* utilities.
1267 (with-current-buffer (tramp-get-buffer vec) 1267 (with-current-buffer (tramp-get-buffer vec)
1268 (erase-buffer) 1268 (erase-buffer)
1269 (tramp-message vec 6 "%s %s" command (mapconcat 'identity args " ")) 1269 (tramp-message vec 6 "%s %s" command (mapconcat 'identity args " "))
1270 (setq result (apply 'tramp-local-call-process command nil t nil args)) 1270 (setq result (apply 'tramp-compat-call-process command nil t nil args))
1271 (tramp-message vec 6 "%s" (buffer-string)) 1271 (tramp-message vec 6 "%s" (buffer-string))
1272 result))) 1272 result)))
1273 1273