*** /tmp/ediffiXLy7X	2020-12-11 09:52:50.304077441 +0100
--- /home/albinus/src/emacs/lisp/battery.el	2020-12-11 09:51:12.514136708 +0100
***************
*** 661,670 ****
    (cond ((stringp battery-upower-device)
           (list battery-upower-device))
          (battery-upower-device)
!         ((dbus-call-method :system battery-upower-service
!                            battery-upower-path
!                            battery-upower-interface
!                            "EnumerateDevices"))))

  (defun battery--upower-state (props state)
    "Merge the UPower battery state in PROPS with STATE.
--- 661,672 ----
    (cond ((stringp battery-upower-device)
           (list battery-upower-device))
          (battery-upower-device)
!         ((dbus-ignore-errors
!            (dbus-call-method :system battery-upower-service
!                              battery-upower-path
!                              battery-upower-interface
!                              "EnumerateDevices"
!                              :timeout 1000)))))

  (defun battery--upower-state (props state)
    "Merge the UPower battery state in PROPS with STATE.