diff options
| author | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-02-12 10:59:03 +0000 |
| commit | f4d5b687150810129b7a1d5b006e31ccf82b691b (patch) | |
| tree | 4229b13800349032697daae3904dc3773e6b7a80 /lisp/battery.el | |
| parent | d5514332d4a6092673ce1f78fadcae0c57f7be64 (diff) | |
| parent | 148100d98319499f0ac6f57b8be08cbd14884a5c (diff) | |
| download | emacs-comment-cache.tar.gz emacs-comment-cache.zip | |
Merge branch 'master' into comment-cachecomment-cache
Diffstat (limited to 'lisp/battery.el')
| -rw-r--r-- | lisp/battery.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/battery.el b/lisp/battery.el index 71268e59ecd..b1834f06ff8 100644 --- a/lisp/battery.el +++ b/lisp/battery.el | |||
| @@ -542,6 +542,9 @@ The following %-sequences are provided: | |||
| 542 | (t "N/A")))))) | 542 | (t "N/A")))))) |
| 543 | 543 | ||
| 544 | 544 | ||
| 545 | (declare-function dbus-get-property "dbus.el" | ||
| 546 | (bus service path interface property)) | ||
| 547 | |||
| 545 | ;;; `upowerd' interface. | 548 | ;;; `upowerd' interface. |
| 546 | (defsubst battery-upower-prop (pname &optional device) | 549 | (defsubst battery-upower-prop (pname &optional device) |
| 547 | (dbus-get-property | 550 | (dbus-get-property |