[Emacs-diffs] /srv/bzr/emacs/trunk r112685: * net/tramp-gvfs.el (top):

[Michael Albinus]

------------------------------------------------------------
revno: 112685
committer: Michael Albinus <address@hidden
branch nick: trunk
timestamp: Thu 2013-05-23 10:43:18 +0200
message:
  * net/tramp-gvfs.el (top):
  * net/xesam.el (xesam-dbus-unique-names): Suppress D-Bus errors
  when loading package.  (Bug#14447)
modified:
  lisp/ChangeLog
  lisp/net/tramp-gvfs.el
  lisp/net/xesam.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-23 07:55:52 +0000
+++ b/lisp/ChangeLog    2013-05-23 08:43:18 +0000
@@ -1,3 +1,9 @@
+2013-05-23  Michael Albinus  <address@hidden>
+
+       * 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  <address@hidden>
 
        * 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.
 

=== modified file 'lisp/net/tramp-gvfs.el'
--- a/lisp/net/tramp-gvfs.el    2013-04-22 10:26:09 +0000
+++ b/lisp/net/tramp-gvfs.el    2013-05-23 08:43:18 +0000
@@ -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"

=== modified file 'lisp/net/xesam.el'
--- a/lisp/net/xesam.el 2013-01-01 09:11:05 +0000
+++ b/lisp/net/xesam.el 2013-05-23 08:43:18 +0000
@@ -264,8 +264,9 @@
 (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)