Commit 7764286e authored by Michael Albinus's avatar Michael Albinus
Browse files

* net/tramp-gvfs.el (top):

* net/xesam.el (xesam-dbus-unique-names): Suppress D-Bus errors
when loading package.  (Bug#14447)
parent 7efe0991
2013-05-23 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-gvfs.el (top):
* net/xesam.el (xesam-dbus-unique-names): Suppress D-Bus errors
when loading package. (Bug#14447)
2013-05-23 Glenn Morris <rgm@gnu.org>
 
* progmodes/js.el: No need to load comint when compiling.
......@@ -1373,7 +1379,7 @@
* net/tramp-sh.el (tramp-perl-pack, tramp-perl-unpack): New defconst.
(tramp-local-coding-commands, tramp-remote-coding-commands): Use them.
(tramp-sh-handle-file-local-copy, tramp-sh-handle-write-region):
(tramp-find-inline-compress):Improve traces.
(tramp-find-inline-compress): Improve traces.
(tramp-maybe-send-script): Check for Perl binary.
(tramp-get-inline-coding): Do not redirect STDOUT for local decoding.
 
......
......@@ -150,9 +150,10 @@
;; Check that GVFS is available. D-Bus integration is available since
;; Emacs 23 on some system types. We don't call `dbus-ping', because
;; this would load dbus.el.
(unless (and (tramp-compat-funcall 'dbus-get-unique-name :session)
(or (tramp-compat-process-running-p "gvfs-fuse-daemon")
(tramp-compat-process-running-p "gvfsd-fuse")))
(unless (ignore-errors
(and (tramp-compat-funcall 'dbus-get-unique-name :session)
(or (tramp-compat-process-running-p "gvfs-fuse-daemon")
(tramp-compat-process-running-p "gvfsd-fuse"))))
(tramp-compat-user-error "Package `tramp-gvfs' not supported"))
(defconst tramp-gvfs-path-mounttracker "/org/gtk/vfs/mounttracker"
......
......@@ -264,8 +264,9 @@ fields are supported.")
(declare-function dbus-get-unique-name "dbusbind.c" (bus))
(defvar xesam-dbus-unique-names
(list (cons :system (dbus-get-unique-name :system))
(cons :session (dbus-get-unique-name :session)))
(ignore-errors
(list (cons :system (dbus-get-unique-name :system))
(cons :session (dbus-get-unique-name :session))))
"The unique names, under which Emacs is registered at D-Bus.")
(defun xesam-dbus-call-method (&rest args)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment