From c78e16962e63895d340f80cf245fad568a7da770 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Fri, 24 Sep 2021 14:46:56 +0200 Subject: ; Adjust overly long docstrings to fit 80 characters --- lisp/net/dbus.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/net/dbus.el') diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 4116d293e1b..560ece67517 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -2073,7 +2073,8 @@ either a method name, a signal name, or an error name." (goto-char point))) (defun dbus-monitor-handler (&rest _args) - "Default handler for the \"org.freedesktop.DBus.Monitoring.BecomeMonitor\" interface. + "Default handler for the \"Monitoring.BecomeMonitor\" interface. +Its full name is \"org.freedesktop.DBus.Monitoring.BecomeMonitor\". It will be applied for all objects created by `dbus-register-monitor' which don't declare an own handler. The printed timestamps do not reflect the time the D-Bus message has passed the D-Bus -- cgit v1.2.3 From 1a02683ceeb6fbcebd0d7bb71dce448177f1d228 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Tue, 12 Oct 2021 13:56:47 +0200 Subject: Make dbus work in a dumped Emacs * lisp/net/dbus.el (dbus--init): Make into a defun. (after-pdump-load-hook): Put it onto the new pdump hook so that it's run after startup (bug#37331). --- lisp/net/dbus.el | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'lisp/net/dbus.el') diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 560ece67517..3fff5398c06 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -2252,15 +2252,19 @@ keywords `:system-private' or `:session-private', respectively." bus nil dbus-path-local dbus-interface-local "Disconnected" #'dbus-handle-bus-disconnect))) - -;; Initialize `:system' and `:session' buses. This adds their file -;; descriptors to input_wait_mask, in order to detect incoming -;; messages immediately. -(when (featurep 'dbusbind) - (dbus-ignore-errors - (dbus-init-bus :system)) - (dbus-ignore-errors - (dbus-init-bus :session))) + +(defun dbus--init () + ;; Initialize `:system' and `:session' buses. This adds their file + ;; descriptors to input_wait_mask, in order to detect incoming + ;; messages immediately. + (when (featurep 'dbusbind) + (dbus-ignore-errors + (dbus-init-bus :system)) + (dbus-ignore-errors + (dbus-init-bus :session)))) + +(add-hook 'after-pdump-load-hook #'dbus--init) +(dbus--init) (provide 'dbus) -- cgit v1.2.3