diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2013-05-23 10:43:18 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2013-05-23 10:43:18 +0200 |
| commit | 7764286ea69667380175fe156c4e82bf789a1e09 (patch) | |
| tree | 7fdcabdf5a02a9da30df9c62b30a85aaae99d2ea | |
| parent | 7efe099165836487f8a9276122d9eece1e4514be (diff) | |
| download | emacs-7764286ea69667380175fe156c4e82bf789a1e09.tar.gz | |
* net/tramp-gvfs.el (top):
* net/xesam.el (xesam-dbus-unique-names): Suppress D-Bus errors
when loading package. (Bug#14447)
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/net/tramp-gvfs.el | 7 | ||||
| -rw-r--r-- | lisp/net/xesam.el | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44dd2c61b50..a5a3bac231a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el index 7c3b393873c..16cf0c00bb0 100644 --- a/lisp/net/tramp-gvfs.el +++ b/lisp/net/tramp-gvfs.el @@ -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" diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index 461cadd21ad..bcb16fc45da 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -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) |