2020-02-06 15:41:26 +00:00
|
|
|
|
;;; battery.el --- display battery status information -*- lexical-binding:t -*-
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2020-01-01 00:19:43 +00:00
|
|
|
|
;; Copyright (C) 1997-1998, 2000-2020 Free Software Foundation, Inc.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2019-05-26 07:58:28 +00:00
|
|
|
|
;; Author: Ralph Schleicher <rs@ralph-schleicher.de>
|
2020-02-06 15:41:26 +00:00
|
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
1998-02-25 22:44:24 +00:00
|
|
|
|
;; Keywords: hardware
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
1997-07-09 00:29:46 +00:00
|
|
|
|
;; This file is part of GNU Emacs.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
1997-06-22 20:08:32 +00:00
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
|
;; (at your option) any later version.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
1997-07-09 00:29:46 +00:00
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
1997-06-22 20:08:32 +00:00
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
2020-06-11 12:48:37 +00:00
|
|
|
|
;; There is at present support for GNU/Linux, BSD, macOS, and Windows.
|
2020-02-06 15:41:26 +00:00
|
|
|
|
;; This library supports:
|
|
|
|
|
|
;; - UPower (https://upower.freedesktop.org) via D-Bus API.
|
2020-06-11 12:48:37 +00:00
|
|
|
|
;; - The `/sys/class/power_supply/' files of Linux >= 2.6.39.
|
|
|
|
|
|
;; - The `/proc/acpi/' directory structure of Linux 2.4.20 and 2.6.
|
|
|
|
|
|
;; - The `/proc/apm' file format of Linux version 1.3.58 or newer.
|
|
|
|
|
|
;; - BSD by using the `apm' program.
|
2020-02-06 15:41:26 +00:00
|
|
|
|
;; - Darwin (macOS) by using the `pmset' program.
|
|
|
|
|
|
;; - Windows via the GetSystemPowerStatus API call.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
2020-02-06 07:35:12 +00:00
|
|
|
|
(require 'dbus)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(eval-when-compile (require 'cl-lib))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
|
(defgroup battery nil
|
|
|
|
|
|
"Display battery status information."
|
|
|
|
|
|
:prefix "battery-"
|
|
|
|
|
|
:group 'hardware)
|
|
|
|
|
|
|
2020-02-06 07:35:12 +00:00
|
|
|
|
(defcustom battery-upower-device nil
|
2020-06-11 12:49:31 +00:00
|
|
|
|
"Preferred UPower device name(s).
|
|
|
|
|
|
When `battery-status-function' is set to `battery-upower', this
|
|
|
|
|
|
user option specifies which power sources to query for status
|
|
|
|
|
|
information and merge into a single report.
|
|
|
|
|
|
|
|
|
|
|
|
When nil (the default), `battery-upower' queries all present
|
|
|
|
|
|
battery and line power devices as determined by the UPower
|
|
|
|
|
|
EnumerateDevices method. A string or a nonempty list of strings
|
|
|
|
|
|
names particular devices to query instead. UPower battery and
|
|
|
|
|
|
line power device names typically follow the patterns
|
|
|
|
|
|
\"battery_BATN\" and \"line_power_ACN\", respectively, with N
|
|
|
|
|
|
starting at 0 when present. Device names should not include the
|
|
|
|
|
|
leading D-Bus path \"/org/freedesktop/UPower/devices/\"."
|
2020-02-06 07:35:12 +00:00
|
|
|
|
:version "28.1"
|
2020-06-11 12:49:31 +00:00
|
|
|
|
:type '(choice (const :tag "Autodetect all devices" nil)
|
|
|
|
|
|
(string :tag "Device")
|
|
|
|
|
|
(repeat :tag "Devices" string)))
|
|
|
|
|
|
|
|
|
|
|
|
(defcustom battery-upower-subscribe t
|
|
|
|
|
|
"Whether to subscribe to UPower device change signals.
|
|
|
|
|
|
When nil, battery status information is polled every
|
|
|
|
|
|
`battery-update-interval' seconds. When non-nil (the default),
|
|
|
|
|
|
the battery status is also updated whenever a power source is
|
|
|
|
|
|
added or removed, or when the system starts or stops running on
|
|
|
|
|
|
battery power.
|
|
|
|
|
|
|
|
|
|
|
|
This only takes effect when `battery-status-function' is set to
|
|
|
|
|
|
`battery-upower' before enabling `display-battery-mode'."
|
2020-02-06 07:35:12 +00:00
|
|
|
|
:version "28.1"
|
2020-06-11 12:49:31 +00:00
|
|
|
|
:type 'boolean)
|
2020-02-06 07:35:12 +00:00
|
|
|
|
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(defconst battery-upower-service "org.freedesktop.UPower"
|
|
|
|
|
|
"Well-known name of the UPower D-Bus service.
|
|
|
|
|
|
See URL `https://upower.freedesktop.org/docs/ref-dbus.html'.")
|
2020-02-06 07:35:12 +00:00
|
|
|
|
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(defun battery--files (dir)
|
|
|
|
|
|
"Return a list of absolute file names in DIR or nil on error.
|
|
|
|
|
|
Value does not include \".\" or \"..\"."
|
|
|
|
|
|
(ignore-errors (directory-files dir t directory-files-no-dot-files-regexp)))
|
|
|
|
|
|
|
2019-08-23 00:40:26 +00:00
|
|
|
|
(defun battery--find-linux-sysfs-batteries ()
|
2020-06-11 12:48:37 +00:00
|
|
|
|
"Return a list of all sysfs battery directories."
|
|
|
|
|
|
(let (dirs)
|
|
|
|
|
|
(dolist (dir (battery--files "/sys/class/power_supply/"))
|
|
|
|
|
|
(when (file-exists-p (expand-file-name "capacity" dir))
|
|
|
|
|
|
(push dir dirs)))
|
2019-08-23 00:40:26 +00:00
|
|
|
|
(nreverse dirs)))
|
|
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
|
(defcustom battery-status-function
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(cond ((member battery-upower-service (dbus-list-activatable-names))
|
2020-02-06 07:35:12 +00:00
|
|
|
|
#'battery-upower)
|
|
|
|
|
|
((and (eq system-type 'gnu/linux)
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(battery--find-linux-sysfs-batteries))
|
|
|
|
|
|
#'battery-linux-sysfs)
|
2003-09-06 19:28:08 +00:00
|
|
|
|
((and (eq system-type 'gnu/linux)
|
|
|
|
|
|
(file-directory-p "/proc/acpi/battery"))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
#'battery-linux-proc-acpi)
|
2008-08-08 17:46:49 +00:00
|
|
|
|
((and (eq system-type 'gnu/linux)
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(file-readable-p "/proc/apm"))
|
|
|
|
|
|
#'battery-linux-proc-apm)
|
2012-12-16 03:17:50 +00:00
|
|
|
|
((and (eq system-type 'berkeley-unix)
|
|
|
|
|
|
(file-executable-p "/usr/sbin/apm"))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
#'battery-bsd-apm)
|
2005-07-05 08:14:42 +00:00
|
|
|
|
((and (eq system-type 'darwin)
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(and (eq (call-process "pmset" nil t nil "-g" "ps") 0)
|
|
|
|
|
|
(not (bobp))))))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
#'battery-pmset)
|
2012-09-17 11:55:02 +00:00
|
|
|
|
((fboundp 'w32-battery-status)
|
2015-03-07 04:42:10 +00:00
|
|
|
|
#'w32-battery-status))
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Function for getting battery status information.
|
2001-02-15 00:10:06 +00:00
|
|
|
|
The function has to return an alist of conversion definitions.
|
|
|
|
|
|
Its cons cells are of the form
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(CONVERSION . REPLACEMENT-TEXT)
|
|
|
|
|
|
|
|
|
|
|
|
CONVERSION is the character code of a \"conversion specification\"
|
1998-03-07 18:19:38 +00:00
|
|
|
|
introduced by a `%' character in a control string."
|
2020-06-11 12:48:37 +00:00
|
|
|
|
:version "28.1"
|
2020-02-06 15:41:26 +00:00
|
|
|
|
:type '(choice (const nil) function))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
|
(defcustom battery-echo-area-format
|
2015-03-07 04:42:10 +00:00
|
|
|
|
"Power %L, battery %B (%p%% load, remaining time %t)"
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Control string formatting the string to display in the echo area.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
Ordinary characters in the control string are printed as-is, while
|
|
|
|
|
|
conversion specifications introduced by a `%' character in the control
|
|
|
|
|
|
string are substituted as defined by the current value of the variable
|
2006-03-11 15:08:42 +00:00
|
|
|
|
`battery-status-function'. Here are the ones generally available:
|
|
|
|
|
|
%c Current capacity (mAh or mWh)
|
|
|
|
|
|
%r Current rate of charge or discharge
|
2020-06-11 12:48:37 +00:00
|
|
|
|
%L AC line status (verbose)
|
2006-03-11 15:08:42 +00:00
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status: empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%d Temperature (in degrees Celsius)
|
|
|
|
|
|
%p Battery load percentage
|
2020-06-11 12:48:37 +00:00
|
|
|
|
%s Remaining time (to charge or discharge) in seconds
|
2006-03-11 15:08:42 +00:00
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
Fix and extend format-spec (bug#41758)
* lisp/format-spec.el: Use lexical-binding. Remove dependence on
subr-x.el.
(format-spec-make): Clarify docstring.
(format-spec--parse-modifiers): Rename to...
(format-spec--parse-flags): ...this and simplify. In particular,
don't bother parsing :space-pad which is redundant and unused.
(format-spec--pad): Remove, replacing with...
(format-spec--do-flags): ...this new helper function which performs
more of format-spec's supported text manipulation.
(format-spec): Autoload. Allow optional argument to take on special
values 'ignore' and 'delete' for more control over what happens when
a replacement for a format specification isn't provided. Bring back
proper support for a precision modifier similar to that of 'format'.
* lisp/battery.el (battery-format): Rewrite in terms of format-spec.
(battery-echo-area-format, battery-mode-line-format): Mention
support of format-spec syntax in docstrings.
* doc/lispref/strings.texi (Custom Format Strings):
* etc/NEWS: Document and announce these changes.
* lisp/dired-aux.el (dired-do-compress-to):
* lisp/erc/erc-match.el (erc-log-matches):
* lisp/erc/erc.el (erc-update-mode-line-buffer):
* lisp/gnus/gnus-sieve.el (gnus-sieve-update):
* lisp/gnus/gssapi.el (open-gssapi-stream):
* lisp/gnus/mail-source.el (mail-source-fetch-file)
(mail-source-fetch-directory, mail-source-fetch-pop)
(mail-source-fetch-imap):
* lisp/gnus/message.el (message-insert-formatted-citation-line):
* lisp/image-dired.el:
* lisp/net/eww.el:
* lisp/net/imap.el (imap-kerberos4-open, imap-gssapi-open)
(imap-shell-open):
* lisp/net/network-stream.el (network-stream-open-shell):
* lisp/obsolete/tls.el (open-tls-stream):
* lisp/textmodes/tex-mode.el:
Remove extraneous loads and autoloads of format-spec now that it is
autoloaded and simplify its uses where possible.
* test/lisp/battery-tests.el (battery-format): Test new format-spec
support.
* test/lisp/format-spec-tests.el (test-format-spec): Rename to...
(format-spec) ...this, extending test cases.
(test-format-unknown): Rename to...
(format-spec-unknown): ...this, extending test cases.
(test-format-modifiers): Rename to...
(format-spec-flags): ...this.
(format-spec-make, format-spec-parse-flags, format-spec-do-flags)
(format-spec-do-flags-truncate, format-spec-do-flags-pad)
(format-spec-do-flags-chop, format-spec-do-flags-case): New tests.
2020-05-29 18:56:14 +00:00
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'
|
|
|
|
|
|
|
|
|
|
|
|
The full `format-spec' formatting syntax is supported."
|
|
|
|
|
|
:link '(info-link "(elisp) Custom Format Strings")
|
2020-02-06 15:41:26 +00:00
|
|
|
|
:type '(choice string (const nil)))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(defvar battery-mode-line-string nil
|
|
|
|
|
|
"String to display in the mode line.")
|
2004-12-27 16:40:50 +00:00
|
|
|
|
;;;###autoload (put 'battery-mode-line-string 'risky-local-variable t)
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2011-06-27 08:04:55 +00:00
|
|
|
|
(defcustom battery-mode-line-limit 100
|
lisp/*.el: Fix typos and other trivial doc fixes
* lisp/allout-widgets.el (allout-widgets-auto-activation)
(allout-current-decorated-p):
* lisp/auth-source.el (auth-source-protocols):
* lisp/autorevert.el (auto-revert-set-timer):
* lisp/battery.el (battery-mode-line-limit):
* lisp/calc/calcalg3.el (math-map-binop):
* lisp/calendar/cal-dst.el (calendar-dst-find-startend):
* lisp/calendar/cal-mayan.el (calendar-mayan-long-count-to-absolute):
* lisp/calendar/calendar.el (calendar-date-echo-text)
(calendar-generate-month, calendar-string-spread)
(calendar-cursor-to-date, calendar-read, calendar-read-date)
(calendar-mark-visible-date, calendar-dayname-on-or-before):
* lisp/calendar/diary-lib.el (diary-ordinal-suffix):
* lisp/cedet/ede/autoconf-edit.el (autoconf-new-program)
(autoconf-find-last-macro, autoconf-parameter-strip):
* lisp/cedet/ede/config.el (ede-target-with-config-build):
* lisp/cedet/ede/linux.el (ede-linux--detect-architecture)
(ede-linux--get-architecture):
* lisp/cedet/semantic/complete.el (semantic-collector-calculate-cache)
(semantic-displayer-abstract, semantic-displayer-point-position):
* lisp/cedet/semantic/format.el (semantic-format-face-alist)
(semantic-format-tag-short-doc):
* lisp/cedet/semantic/fw.el (semantic-find-file-noselect):
* lisp/cedet/semantic/idle.el (semantic-idle-scheduler-work-idle-time)
(semantic-idle-breadcrumbs-display-function)
(semantic-idle-breadcrumbs-format-tag-list-function):
* lisp/cedet/semantic/lex.el (semantic-lex-map-types)
(define-lex, define-lex-block-type-analyzer):
* lisp/cedet/semantic/senator.el (senator-search-default-tag-filter):
* lisp/cedet/semantic/symref.el (semantic-symref-result)
(semantic-symref-hit-to-tag-via-db):
* lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass):
* lisp/cedet/semantic/tag.el (semantic-tag-new-variable)
(semantic-tag-new-include, semantic-tag-new-package)
(semantic-tag-set-faux, semantic-create-tag-proxy)
(semantic-tag-function-parent)
(semantic-tag-components-with-overlays):
* lisp/cedet/srecode/cpp.el (srecode-cpp-namespaces)
(srecode-semantic-handle-:c, srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/dictionary.el (srecode-create-dictionary)
(srecode-dictionary-add-entries, srecode-dictionary-lookup-name)
(srecode-create-dictionaries-from-tags):
* lisp/cmuscheme.el (scheme-compile-region):
* lisp/color.el (color-lab-to-lch):
* lisp/doc-view.el (doc-view-image-width)
(doc-view-set-up-single-converter):
* lisp/dynamic-setting.el (font-setting-change-default-font)
(dynamic-setting-handle-config-changed-event):
* lisp/elec-pair.el (electric-pair-text-pairs)
(electric-pair-skip-whitespace-function)
(electric-pair-string-bound-function):
* lisp/emacs-lisp/avl-tree.el (avl-tree--del-balance)
(avl-tree-member, avl-tree-mapcar, avl-tree-iter):
* lisp/emacs-lisp/bytecomp.el (byte-compile-generate-call-tree):
* lisp/emacs-lisp/checkdoc.el (checkdoc-autofix-flag)
(checkdoc-spellcheck-documentation-flag, checkdoc-ispell)
(checkdoc-ispell-current-buffer, checkdoc-ispell-interactive)
(checkdoc-ispell-message-interactive)
(checkdoc-ispell-message-text, checkdoc-ispell-start)
(checkdoc-ispell-continue, checkdoc-ispell-comments)
(checkdoc-ispell-defun):
* lisp/emacs-lisp/cl-generic.el (cl--generic-search-method):
* lisp/emacs-lisp/eieio-custom.el (eieio-read-customization-group):
* lisp/emacs-lisp/lisp.el (forward-sexp, up-list):
* lisp/emacs-lisp/package-x.el (package--archive-contents-from-file):
* lisp/emacs-lisp/package.el (package-desc)
(package--make-autoloads-and-stuff, package-hidden-regexps):
* lisp/emacs-lisp/tcover-ses.el (ses-exercise-startup):
* lisp/emacs-lisp/testcover.el (testcover-nohits)
(testcover-1value):
* lisp/epg.el (epg-receive-keys, epg-start-edit-key):
* lisp/erc/erc-backend.el (erc-server-processing-p)
(erc-split-line-length, erc-server-coding-system)
(erc-server-send, erc-message):
* lisp/erc/erc-button.el (erc-button-face, erc-button-alist)
(erc-browse-emacswiki):
* lisp/erc/erc-ezbounce.el (erc-ezbounce, erc-ezb-get-login):
* lisp/erc/erc-fill.el (erc-fill-variable-maximum-indentation):
* lisp/erc/erc-log.el (erc-current-logfile):
* lisp/erc/erc-match.el (erc-log-match-format)
(erc-text-matched-hook):
* lisp/erc/erc-netsplit.el (erc-netsplit, erc-netsplit-debug):
* lisp/erc/erc-networks.el (erc-server-alist)
(erc-networks-alist, erc-current-network):
* lisp/erc/erc-ring.el (erc-input-ring-index):
* lisp/erc/erc-speedbar.el (erc-speedbar)
(erc-speedbar-update-channel):
* lisp/erc/erc-stamp.el (erc-timestamp-only-if-changed-flag):
* lisp/erc/erc-track.el (erc-track-position-in-mode-line)
(erc-track-remove-from-mode-line, erc-modified-channels-update)
(erc-track-last-non-erc-buffer, erc-track-sort-by-importance)
(erc-track-get-active-buffer):
* lisp/erc/erc.el (erc-get-channel-user-list)
(erc-echo-notice-hook, erc-echo-notice-always-hook)
(erc-wash-quit-reason, erc-format-@nick):
* lisp/ffap.el (ffap-latex-mode):
* lisp/files.el (abort-if-file-too-large)
(dir-locals--get-sort-score, buffer-stale--default-function):
* lisp/filesets.el (filesets-tree-max-level, filesets-data)
(filesets-update-pre010505):
* lisp/gnus/gnus-agent.el (gnus-agent-flush-cache):
* lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol)
(gnus-button-prefer-mid-or-mail):
* lisp/gnus/gnus-cus.el (gnus-group-parameters):
* lisp/gnus/gnus-demon.el (gnus-demon-handlers)
(gnus-demon-run-callback):
* lisp/gnus/gnus-dired.el (gnus-dired-print):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-buffer):
* lisp/gnus/gnus-range.el (gnus-range-normalize):
* lisp/gnus/gnus-spec.el (gnus-pad-form):
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud)
(gnus-server-opened, gnus-server-closed, gnus-server-denied)
(gnus-server-offline):
* lisp/gnus/gnus-sum.el (gnus-refer-thread-use-nnir)
(gnus-refer-thread-limit-to-thread)
(gnus-summary-limit-include-thread, gnus-summary-refer-thread)
(gnus-summary-find-matching):
* lisp/gnus/gnus-util.el (gnus-rescale-image):
* lisp/gnus/gnus.el (gnus-summary-line-format, gnus-no-server):
* lisp/gnus/mail-source.el (mail-source-incoming-file-prefix):
* lisp/gnus/message.el (message-cite-reply-position)
(message-cite-style-outlook, message-cite-style-thunderbird)
(message-cite-style-gmail, message--send-mail-maybe-partially):
* lisp/gnus/mm-extern.el (mm-inline-external-body):
* lisp/gnus/mm-partial.el (mm-inline-partial):
* lisp/gnus/mml-sec.el (mml-secure-message-sign)
(mml-secure-message-sign-encrypt, mml-secure-message-encrypt):
* lisp/gnus/mml2015.el (mml2015-epg-key-image)
(mml2015-epg-key-image-to-string):
* lisp/gnus/nndiary.el (nndiary-reminders, nndiary-get-new-mail):
* lisp/gnus/nnheader.el (nnheader-directory-files-is-safe):
* lisp/gnus/nnir.el (nnir-search-history)
(nnir-imap-search-other, nnir-artlist-length)
(nnir-artlist-article, nnir-artitem-group, nnir-artitem-number)
(nnir-artitem-rsv, nnir-article-group, nnir-article-number)
(nnir-article-rsv, nnir-article-ids, nnir-categorize)
(nnir-retrieve-headers-override-function)
(nnir-imap-default-search-key, nnir-hyrex-additional-switches)
(gnus-group-make-nnir-group, nnir-run-namazu, nnir-read-parms)
(nnir-read-parm, nnir-read-server-parm, nnir-search-thread):
* lisp/gnus/nnmairix.el (nnmairix-default-group)
(nnmairix-propagate-marks):
* lisp/gnus/smime.el (smime-keys, smime-crl-check)
(smime-verify-buffer, smime-noverify-buffer):
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url):
* lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header)
(spam-spamassassin-spam-status-header, spam-sa-learn-rebuild)
(spam-classifications, spam-check-stat, spam-spamassassin-score):
* lisp/help.el (describe-minor-mode-from-symbol):
* lisp/hippie-exp.el (hippie-expand-ignore-buffers):
* lisp/htmlfontify.el (hfy-optimizations, hfy-face-resolve-face)
(hfy-begin-span):
* lisp/ibuf-ext.el (ibuffer-update-saved-filters-format)
(ibuffer-saved-filters, ibuffer-old-saved-filters-warning)
(ibuffer-filtering-qualifiers, ibuffer-repair-saved-filters)
(eval, ibuffer-unary-operand, file-extension, directory):
* lisp/image-dired.el (image-dired-cmd-pngcrush-options):
* lisp/image-mode.el (image-toggle-display):
* lisp/international/ccl.el (ccl-compile-read-multibyte-character)
(ccl-compile-write-multibyte-character):
* lisp/international/kkc.el (kkc-save-init-file):
* lisp/international/latin1-disp.el (latin1-display):
* lisp/international/ogonek.el (ogonek-name-encoding-alist)
(ogonek-information, ogonek-lookup-encoding)
(ogonek-deprefixify-region):
* lisp/isearch.el (isearch-filter-predicate)
(isearch--momentary-message):
* lisp/jsonrpc.el (jsonrpc-connection-send)
(jsonrpc-process-connection, jsonrpc-shutdown)
(jsonrpc--async-request-1):
* lisp/language/tibet-util.el (tibetan-char-p):
* lisp/mail/feedmail.el (feedmail-queue-use-send-time-for-date)
(feedmail-last-chance-hook, feedmail-before-fcc-hook)
(feedmail-send-it-immediately-wrapper, feedmail-find-eoh):
* lisp/mail/hashcash.el (hashcash-generate-payment)
(hashcash-generate-payment-async, hashcash-insert-payment)
(hashcash-verify-payment):
* lisp/mail/rmail.el (rmail-movemail-variant-in-use)
(rmail-get-attr-value):
* lisp/mail/rmailmm.el (rmail-mime-prefer-html, rmail-mime):
* lisp/mail/rmailsum.el (rmail-summary-show-message):
* lisp/mail/supercite.el (sc-raw-mode-toggle):
* lisp/man.el (Man-start-calling):
* lisp/mh-e/mh-acros.el (mh-do-at-event-location)
(mh-iterate-on-messages-in-region, mh-iterate-on-range):
* lisp/mh-e/mh-alias.el (mh-alias-system-aliases)
(mh-alias-reload, mh-alias-ali)
(mh-alias-canonicalize-suggestion, mh-alias-add-alias-to-file)
(mh-alias-add-alias):
* lisp/mouse.el (mouse-save-then-kill):
* lisp/net/browse-url.el (browse-url-default-macosx-browser):
* lisp/net/eudc.el (eudc-set, eudc-variable-protocol-value)
(eudc-variable-server-value, eudc-update-variable)
(eudc-expand-inline):
* lisp/net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result):
* lisp/net/eudcb-ldap.el (eudc-ldap-get-field-list):
* lisp/net/pop3.el (pop3-list):
* lisp/net/soap-client.el (soap-namespace-put)
(soap-xs-parse-sequence, soap-parse-envelope):
* lisp/net/soap-inspect.el (soap-inspect-xs-complex-type):
* lisp/nxml/rng-xsd.el (rng-xsd-date-to-days):
* lisp/org/ob-C.el (org-babel-prep-session:C)
(org-babel-load-session:C):
* lisp/org/ob-J.el (org-babel-execute:J):
* lisp/org/ob-asymptote.el (org-babel-prep-session:asymptote):
* lisp/org/ob-awk.el (org-babel-execute:awk):
* lisp/org/ob-core.el (org-babel-process-file-name):
* lisp/org/ob-ebnf.el (org-babel-execute:ebnf):
* lisp/org/ob-forth.el (org-babel-execute:forth):
* lisp/org/ob-fortran.el (org-babel-execute:fortran)
(org-babel-prep-session:fortran, org-babel-load-session:fortran):
* lisp/org/ob-groovy.el (org-babel-execute:groovy):
* lisp/org/ob-io.el (org-babel-execute:io):
* lisp/org/ob-js.el (org-babel-execute:js):
* lisp/org/ob-lilypond.el (org-babel-default-header-args:lilypond)
(org-babel-lilypond-compile-post-tangle)
(org-babel-lilypond-display-pdf-post-tangle)
(org-babel-lilypond-tangle)
(org-babel-lilypond-execute-tangled-ly)
(org-babel-lilypond-compile-lilyfile)
(org-babel-lilypond-check-for-compile-error)
(org-babel-lilypond-process-compile-error)
(org-babel-lilypond-mark-error-line)
(org-babel-lilypond-parse-error-line)
(org-babel-lilypond-attempt-to-open-pdf)
(org-babel-lilypond-attempt-to-play-midi)
(org-babel-lilypond-switch-extension)
(org-babel-lilypond-set-header-args):
* lisp/org/ob-lua.el (org-babel-prep-session:lua):
* lisp/org/ob-picolisp.el (org-babel-execute:picolisp):
* lisp/org/ob-processing.el (org-babel-prep-session:processing):
* lisp/org/ob-python.el (org-babel-prep-session:python):
* lisp/org/ob-scheme.el (org-babel-scheme-capture-current-message)
(org-babel-scheme-execute-with-geiser, org-babel-execute:scheme):
* lisp/org/ob-shen.el (org-babel-execute:shen):
* lisp/org/org-agenda.el (org-agenda-entry-types)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-time-grid, org-agenda-sorting-strategy)
(org-agenda-filter-by-category, org-agenda-forward-block):
* lisp/org/org-colview.el (org-columns--overlay-text):
* lisp/org/org-faces.el (org-verbatim, org-cycle-level-faces):
* lisp/org/org-indent.el (org-indent-set-line-properties):
* lisp/org/org-macs.el (org-get-limited-outline-regexp):
* lisp/org/org-mobile.el (org-mobile-files):
* lisp/org/org.el (org-use-fast-todo-selection)
(org-extend-today-until, org-use-property-inheritance)
(org-refresh-effort-properties, org-open-at-point-global)
(org-track-ordered-property-with-tag, org-shiftright):
* lisp/org/ox-html.el (org-html-checkbox-type):
* lisp/org/ox-man.el (org-man-source-highlight)
(org-man-verse-block):
* lisp/org/ox-publish.el (org-publish-sitemap-default):
* lisp/outline.el (outline-head-from-level):
* lisp/progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-calc-command-indent, dcl-indent-to):
* lisp/progmodes/flymake.el (flymake-make-diagnostic)
(flymake--overlays, flymake-diagnostic-functions)
(flymake-diagnostic-types-alist, flymake--backend-state)
(flymake-is-running, flymake--collect, flymake-mode):
* lisp/progmodes/gdb-mi.el (gdb-threads-list, gdb, gdb-non-stop)
(gdb-buffers, gdb-gud-context-call, gdb-jsonify-buffer):
* lisp/progmodes/grep.el (grep-error-screen-columns):
* lisp/progmodes/gud.el (gud-prev-expr):
* lisp/progmodes/ps-mode.el (ps-mode, ps-mode-target-column)
(ps-run-goto-error):
* lisp/progmodes/python.el (python-eldoc-get-doc)
(python-eldoc-function-timeout-permanent, python-eldoc-function):
* lisp/shadowfile.el (shadow-make-group):
* lisp/speedbar.el (speedbar-obj-do-check):
* lisp/textmodes/flyspell.el (flyspell-auto-correct-previous-hook):
* lisp/textmodes/reftex-cite.el (reftex-bib-or-thebib):
* lisp/textmodes/reftex-index.el (reftex-index-goto-entry)
(reftex-index-kill, reftex-index-undo):
* lisp/textmodes/reftex-parse.el (reftex-context-substring):
* lisp/textmodes/reftex.el (reftex-TeX-master-file):
* lisp/textmodes/rst.el (rst-next-hdr, rst-toc)
(rst-uncomment-region, rst-font-lock-extend-region-internal):
* lisp/thumbs.el (thumbs-mode):
* lisp/vc/ediff-util.el (ediff-restore-diff):
* lisp/vc/pcvs-defs.el (cvs-cvsroot, cvs-force-dir-tag):
* lisp/vc/vc-hg.el (vc-hg--ignore-patterns-valid-p):
* lisp/wid-edit.el (widget-field-value-set, string):
* lisp/x-dnd.el (x-dnd-version-from-flags)
(x-dnd-more-than-3-from-flags): Assorted docfixes.
2019-09-20 22:27:53 +00:00
|
|
|
|
"Percentage of full battery load below which display battery status."
|
Add missing :version tags to new defgroups and defcustoms
* window.el (window-sides-slots):
* tool-bar.el (tool-bar-position):
* term/xterm.el (xterm-extra-capabilities):
* ses.el (ses-self-reference-early-detection):
* progmodes/verilog-mode.el (verilog-auto-declare-nettype)
(verilog-auto-wire-type)
(verilog-auto-delete-trailing-whitespace)
(verilog-auto-reset-blocking-in-non, verilog-auto-inst-sort)
(verilog-auto-tieoff-declaration):
* progmodes/sql.el (sql-login-hook, sql-ansi-statement-starters)
(sql-oracle-statement-starters, sql-oracle-scan-on):
* progmodes/prolog.el (prolog-align-comments-flag)
(prolog-indent-mline-comments-flag, prolog-object-end-to-0-flag)
(prolog-left-indent-regexp, prolog-paren-indent-p)
(prolog-paren-indent, prolog-parse-mode, prolog-keywords)
(prolog-types, prolog-mode-specificators)
(prolog-determinism-specificators, prolog-directives)
(prolog-electric-newline-flag, prolog-hungry-delete-key-flag)
(prolog-electric-dot-flag)
(prolog-electric-dot-full-predicate-template)
(prolog-electric-underscore-flag, prolog-electric-tab-flag)
(prolog-electric-if-then-else-flag, prolog-electric-colon-flag)
(prolog-electric-dash-flag, prolog-old-sicstus-keys-flag)
(prolog-program-switches, prolog-prompt-regexp)
(prolog-debug-on-string, prolog-debug-off-string)
(prolog-trace-on-string, prolog-trace-off-string)
(prolog-zip-on-string, prolog-zip-off-string)
(prolog-use-standard-consult-compile-method-flag)
(prolog-use-prolog-tokenizer-flag, prolog-imenu-flag)
(prolog-imenu-max-lines, prolog-info-predicate-index)
(prolog-underscore-wordchar-flag, prolog-use-sicstus-sd)
(prolog-char-quote-workaround):
* progmodes/cc-vars.el (c-defun-tactic):
* net/tramp.el (tramp-encoding-command-interactive)
(tramp-local-end-of-line):
* net/soap-client.el (soap-client):
* net/netrc.el (netrc-file):
* net/gnutls.el (gnutls):
* minibuffer.el (completion-category-overrides)
(completion-cycle-threshold)
(completion-pcm-complete-word-inserts-delimiters):
* man.el (Man-name-local-regexp):
* mail/feedmail.el (feedmail-display-full-frame):
* international/characters.el (glyphless-char-display-control):
* eshell/em-ls.el (eshell-ls-date-format):
* emacs-lisp/cl-indent.el (lisp-lambda-list-keyword-alignment)
(lisp-lambda-list-keyword-parameter-indentation)
(lisp-lambda-list-keyword-parameter-alignment):
* doc-view.el (doc-view-image-width, doc-view-unoconv-program):
* dired-x.el (dired-omit-verbose):
* cus-theme.el (custom-theme-allow-multiple-selections):
* calc/calc.el (calc-highlight-selections-with-faces)
(calc-lu-field-reference, calc-lu-power-reference)
(calc-note-threshold):
* battery.el (battery-mode-line-limit):
* arc-mode.el (archive-7z-extract, archive-7z-expunge)
(archive-7z-update):
* allout.el (allout-prefixed-keybindings)
(allout-unprefixed-keybindings)
(allout-inhibit-auto-fill-on-headline)
(allout-flattened-numbering-abbreviation):
* allout-widgets.el (allout-widgets-auto-activation)
(allout-widgets-icons-dark-subdir)
(allout-widgets-icons-light-subdir, allout-widgets-icon-types)
(allout-widgets-theme-dark-background)
(allout-widgets-theme-light-background)
(allout-widgets-item-image-properties-emacs)
(allout-widgets-item-image-properties-xemacs)
(allout-widgets-run-unit-tests-on-load)
(allout-widgets-time-decoration-activity)
(allout-widgets-hook-error-post-time)
(allout-widgets-track-decoration):
* gnus/sieve-manage.el (sieve-manage-default-stream):
* gnus/shr.el (shr):
* gnus/nnir.el (nnir-ignored-newsgroups, nnir-summary-line-format)
(nnir-retrieve-headers-override-function)
(nnir-imap-default-search-key, nnir-notmuch-program)
(nnir-notmuch-additional-switches, nnir-notmuch-remove-prefix)
(nnir-method-default-engines):
* gnus/message.el (message-cite-reply-position):
* gnus/gssapi.el (gssapi-program):
* gnus/gravatar.el (gravatar):
* gnus/gnus-sum.el (gnus-refer-thread-use-nnir):
* gnus/gnus-registry.el (gnus-registry-unfollowed-addresses)
(gnus-registry-max-pruned-entries):
* gnus/gnus-picon.el (gnus-picon-inhibit-top-level-domains):
* gnus/gnus-int.el (gnus-after-set-mark-hook)
(gnus-before-update-mark-hook):
* gnus/gnus-async.el (gnus-async-post-fetch-function):
* gnus/auth-source.el (auth-source-cache-expiry):
Add missing :version tags to new defcustoms and defgroups.
2012-02-11 22:13:29 +00:00
|
|
|
|
:version "24.1"
|
2020-02-06 15:41:26 +00:00
|
|
|
|
:type 'integer)
|
2011-06-27 08:04:55 +00:00
|
|
|
|
|
1998-03-07 18:19:38 +00:00
|
|
|
|
(defcustom battery-mode-line-format
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(cond ((eq battery-status-function #'battery-linux-proc-acpi)
|
2013-03-05 17:13:01 +00:00
|
|
|
|
"[%b%p%%,%d°C]")
|
2008-04-29 00:59:37 +00:00
|
|
|
|
(battery-status-function
|
2005-07-05 08:14:42 +00:00
|
|
|
|
"[%b%p%%]"))
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Control string formatting the string to display in the mode line.
|
1997-06-22 20:08:32 +00:00
|
|
|
|
Ordinary characters in the control string are printed as-is, while
|
|
|
|
|
|
conversion specifications introduced by a `%' character in the control
|
|
|
|
|
|
string are substituted as defined by the current value of the variable
|
2006-03-11 15:08:42 +00:00
|
|
|
|
`battery-status-function'. Here are the ones generally available:
|
|
|
|
|
|
%c Current capacity (mAh or mWh)
|
|
|
|
|
|
%r Current rate of charge or discharge
|
2020-06-11 12:48:37 +00:00
|
|
|
|
%L AC line status (verbose)
|
2006-03-11 15:08:42 +00:00
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status: empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%d Temperature (in degrees Celsius)
|
|
|
|
|
|
%p Battery load percentage
|
2020-06-11 12:48:37 +00:00
|
|
|
|
%s Remaining time (to charge or discharge) in seconds
|
2006-03-11 15:08:42 +00:00
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
Fix and extend format-spec (bug#41758)
* lisp/format-spec.el: Use lexical-binding. Remove dependence on
subr-x.el.
(format-spec-make): Clarify docstring.
(format-spec--parse-modifiers): Rename to...
(format-spec--parse-flags): ...this and simplify. In particular,
don't bother parsing :space-pad which is redundant and unused.
(format-spec--pad): Remove, replacing with...
(format-spec--do-flags): ...this new helper function which performs
more of format-spec's supported text manipulation.
(format-spec): Autoload. Allow optional argument to take on special
values 'ignore' and 'delete' for more control over what happens when
a replacement for a format specification isn't provided. Bring back
proper support for a precision modifier similar to that of 'format'.
* lisp/battery.el (battery-format): Rewrite in terms of format-spec.
(battery-echo-area-format, battery-mode-line-format): Mention
support of format-spec syntax in docstrings.
* doc/lispref/strings.texi (Custom Format Strings):
* etc/NEWS: Document and announce these changes.
* lisp/dired-aux.el (dired-do-compress-to):
* lisp/erc/erc-match.el (erc-log-matches):
* lisp/erc/erc.el (erc-update-mode-line-buffer):
* lisp/gnus/gnus-sieve.el (gnus-sieve-update):
* lisp/gnus/gssapi.el (open-gssapi-stream):
* lisp/gnus/mail-source.el (mail-source-fetch-file)
(mail-source-fetch-directory, mail-source-fetch-pop)
(mail-source-fetch-imap):
* lisp/gnus/message.el (message-insert-formatted-citation-line):
* lisp/image-dired.el:
* lisp/net/eww.el:
* lisp/net/imap.el (imap-kerberos4-open, imap-gssapi-open)
(imap-shell-open):
* lisp/net/network-stream.el (network-stream-open-shell):
* lisp/obsolete/tls.el (open-tls-stream):
* lisp/textmodes/tex-mode.el:
Remove extraneous loads and autoloads of format-spec now that it is
autoloaded and simplify its uses where possible.
* test/lisp/battery-tests.el (battery-format): Test new format-spec
support.
* test/lisp/format-spec-tests.el (test-format-spec): Rename to...
(format-spec) ...this, extending test cases.
(test-format-unknown): Rename to...
(format-spec-unknown): ...this, extending test cases.
(test-format-modifiers): Rename to...
(format-spec-flags): ...this.
(format-spec-make, format-spec-parse-flags, format-spec-do-flags)
(format-spec-do-flags-truncate, format-spec-do-flags-pad)
(format-spec-do-flags-chop, format-spec-do-flags-case): New tests.
2020-05-29 18:56:14 +00:00
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'
|
|
|
|
|
|
|
|
|
|
|
|
The full `format-spec' formatting syntax is supported."
|
|
|
|
|
|
:link '(info-link "(elisp) Custom Format Strings")
|
2020-02-06 15:41:26 +00:00
|
|
|
|
:type '(choice string (const nil)))
|
1998-03-07 18:19:38 +00:00
|
|
|
|
|
|
|
|
|
|
(defcustom battery-update-interval 60
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Seconds after which the battery status will be updated."
|
2020-02-06 15:41:26 +00:00
|
|
|
|
:type 'integer)
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(defcustom battery-load-low 25
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Upper bound of low battery load percentage.
|
2005-07-05 08:14:42 +00:00
|
|
|
|
A battery load percentage below this number is considered low."
|
2020-02-06 15:41:26 +00:00
|
|
|
|
:type 'integer)
|
2005-07-05 08:14:42 +00:00
|
|
|
|
|
|
|
|
|
|
(defcustom battery-load-critical 10
|
2008-12-03 05:48:14 +00:00
|
|
|
|
"Upper bound of critical battery load percentage.
|
2005-07-05 08:14:42 +00:00
|
|
|
|
A battery load percentage below this number is considered critical."
|
2020-02-06 15:41:26 +00:00
|
|
|
|
:type 'integer)
|
2005-07-05 08:14:42 +00:00
|
|
|
|
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(defface battery-load-low
|
|
|
|
|
|
'((t :inherit warning))
|
|
|
|
|
|
"Face used in mode line string when battery load is low.
|
|
|
|
|
|
See the option `battery-load-low'."
|
|
|
|
|
|
:version "28.1")
|
|
|
|
|
|
|
|
|
|
|
|
(defface battery-load-critical
|
|
|
|
|
|
'((t :inherit error))
|
|
|
|
|
|
"Face used in mode line string when battery load is critical.
|
|
|
|
|
|
See the option `battery-load-critical'."
|
|
|
|
|
|
:version "28.1")
|
|
|
|
|
|
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(defvar battery-update-timer nil
|
|
|
|
|
|
"Interval timer object.")
|
|
|
|
|
|
|
1998-03-06 17:45:55 +00:00
|
|
|
|
;;;###autoload
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(defun battery ()
|
|
|
|
|
|
"Display battery status information in the echo area.
|
1999-12-14 10:19:59 +00:00
|
|
|
|
The text being displayed in the echo area is controlled by the variables
|
1997-06-22 20:08:32 +00:00
|
|
|
|
`battery-echo-area-format' and `battery-status-function'."
|
|
|
|
|
|
(interactive)
|
|
|
|
|
|
(message "%s" (if (and battery-echo-area-format battery-status-function)
|
|
|
|
|
|
(battery-format battery-echo-area-format
|
|
|
|
|
|
(funcall battery-status-function))
|
|
|
|
|
|
"Battery status not available")))
|
|
|
|
|
|
|
1998-03-06 17:45:55 +00:00
|
|
|
|
;;;###autoload
|
2005-01-04 21:15:09 +00:00
|
|
|
|
(define-minor-mode display-battery-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
"Toggle battery status display in mode line (Display Battery mode).
|
|
|
|
|
|
|
|
|
|
|
|
The text displayed in the mode line is controlled by
|
1997-06-22 20:08:32 +00:00
|
|
|
|
`battery-mode-line-format' and `battery-status-function'.
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
|
The mode line is be updated every `battery-update-interval'
|
1997-06-22 20:08:32 +00:00
|
|
|
|
seconds."
|
2020-02-06 15:41:26 +00:00
|
|
|
|
:global t
|
1997-06-22 20:08:32 +00:00
|
|
|
|
(setq battery-mode-line-string "")
|
|
|
|
|
|
(or global-mode-string (setq global-mode-string '("")))
|
|
|
|
|
|
(and battery-update-timer (cancel-timer battery-update-timer))
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(battery--upower-unsubscribe)
|
2011-08-25 19:49:57 +00:00
|
|
|
|
(if (and battery-status-function battery-mode-line-format)
|
|
|
|
|
|
(if (not display-battery-mode)
|
|
|
|
|
|
(setq global-mode-string
|
|
|
|
|
|
(delq 'battery-mode-line-string global-mode-string))
|
|
|
|
|
|
(add-to-list 'global-mode-string 'battery-mode-line-string t)
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(and (eq battery-status-function #'battery-upower)
|
|
|
|
|
|
battery-upower-subscribe
|
|
|
|
|
|
(battery--upower-subsribe))
|
2011-08-25 19:49:57 +00:00
|
|
|
|
(setq battery-update-timer (run-at-time nil battery-update-interval
|
2020-06-11 12:48:37 +00:00
|
|
|
|
#'battery-update-handler))
|
2011-08-25 19:49:57 +00:00
|
|
|
|
(battery-update))
|
|
|
|
|
|
(message "Battery status not available")
|
|
|
|
|
|
(setq display-battery-mode nil)))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(defun battery-update-handler ()
|
|
|
|
|
|
(battery-update)
|
|
|
|
|
|
(sit-for 0))
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-update ()
|
|
|
|
|
|
"Update battery status information in the mode line."
|
2014-04-25 18:01:18 +00:00
|
|
|
|
(let* ((data (and battery-status-function (funcall battery-status-function)))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(percentage (car (read-from-string (cdr (assq ?p data)))))
|
|
|
|
|
|
(res (and battery-mode-line-format
|
|
|
|
|
|
(or (not (numberp percentage))
|
|
|
|
|
|
(<= percentage battery-mode-line-limit))
|
|
|
|
|
|
(battery-format battery-mode-line-format data)))
|
|
|
|
|
|
(len (length res)))
|
|
|
|
|
|
(unless (zerop len)
|
|
|
|
|
|
(cond ((not (numberp percentage)))
|
|
|
|
|
|
((< percentage battery-load-critical)
|
|
|
|
|
|
(add-face-text-property 0 len 'battery-load-critical t res))
|
|
|
|
|
|
((< percentage battery-load-low)
|
|
|
|
|
|
(add-face-text-property 0 len 'battery-load-low t res)))
|
|
|
|
|
|
(put-text-property 0 len 'help-echo "Battery status information" res))
|
|
|
|
|
|
(setq battery-mode-line-string (or res "")))
|
|
|
|
|
|
(force-mode-line-update t))
|
|
|
|
|
|
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
;;; `/proc/apm' interface for Linux.
|
|
|
|
|
|
|
2020-06-11 12:48:37 +00:00
|
|
|
|
;; Regular expression matching contents of `/proc/apm'.
|
|
|
|
|
|
(rx-define battery--linux-proc-apm
|
|
|
|
|
|
(: bol (group (+ (not ?\s))) ; Driver version.
|
|
|
|
|
|
" " (group (+ (not ?\s))) ; APM BIOS version.
|
|
|
|
|
|
" 0x" (group (+ xdigit)) ; APM BIOS flags.
|
|
|
|
|
|
" 0x" (group (+ xdigit)) ; AC line status.
|
|
|
|
|
|
" 0x" (group (+ xdigit)) ; Battery status.
|
|
|
|
|
|
" 0x" (group (+ xdigit)) ; Battery flags.
|
|
|
|
|
|
" " (group (? ?-) (+ digit)) ?% ; Load percentage.
|
|
|
|
|
|
" " (group (? ?-) (+ digit)) ; Remaining time.
|
|
|
|
|
|
" " (group (* nonl)) ; Time unit
|
|
|
|
|
|
eol))
|
|
|
|
|
|
|
|
|
|
|
|
(defconst battery-linux-proc-apm-regexp (rx battery--linux-proc-apm)
|
1997-06-22 20:08:32 +00:00
|
|
|
|
"Regular expression matching contents of `/proc/apm'.")
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(make-obsolete-variable 'battery-linux-proc-apm-regexp
|
|
|
|
|
|
"it is no longer used." "28.1")
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(defun battery-linux-proc-apm ()
|
2012-01-02 23:18:48 +00:00
|
|
|
|
"Get APM status information from Linux (the kernel).
|
1997-06-22 20:08:32 +00:00
|
|
|
|
This function works only with the new `/proc/apm' format introduced
|
|
|
|
|
|
in Linux version 1.3.58.
|
|
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%v Linux driver version
|
|
|
|
|
|
%V APM BIOS version
|
|
|
|
|
|
%I APM BIOS status (verbose)
|
|
|
|
|
|
%L AC line status (verbose)
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
2005-07-01 11:03:19 +00:00
|
|
|
|
%p Battery load percentage
|
2006-03-11 15:08:42 +00:00
|
|
|
|
%s Remaining time (to charge or discharge) in seconds
|
|
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(let ( driver-version bios-version bios-interface line-status
|
|
|
|
|
|
battery-status battery-status-symbol load-percentage
|
|
|
|
|
|
seconds minutes hours remaining-time tem )
|
2005-07-01 11:03:19 +00:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(ignore-errors (insert-file-contents "/proc/apm"))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(when (re-search-forward (rx battery--linux-proc-apm) nil t)
|
2005-07-01 11:03:19 +00:00
|
|
|
|
(setq driver-version (match-string 1))
|
|
|
|
|
|
(setq bios-version (match-string 2))
|
|
|
|
|
|
(setq tem (string-to-number (match-string 3) 16))
|
|
|
|
|
|
(if (not (logand tem 2))
|
|
|
|
|
|
(setq bios-interface "not supported")
|
|
|
|
|
|
(setq bios-interface "enabled")
|
|
|
|
|
|
(cond ((logand tem 16) (setq bios-interface "disabled"))
|
|
|
|
|
|
((logand tem 32) (setq bios-interface "disengaged")))
|
|
|
|
|
|
(setq tem (string-to-number (match-string 4) 16))
|
|
|
|
|
|
(cond ((= tem 0) (setq line-status "off-line"))
|
|
|
|
|
|
((= tem 1) (setq line-status "on-line"))
|
|
|
|
|
|
((= tem 2) (setq line-status "on backup")))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(unless (= (string-to-number (match-string 6) 16) 255)
|
2005-07-01 11:03:19 +00:00
|
|
|
|
(setq tem (string-to-number (match-string 5) 16))
|
|
|
|
|
|
(cond ((= tem 0) (setq battery-status "high"
|
|
|
|
|
|
battery-status-symbol ""))
|
|
|
|
|
|
((= tem 1) (setq battery-status "low"
|
|
|
|
|
|
battery-status-symbol "-"))
|
|
|
|
|
|
((= tem 2) (setq battery-status "critical"
|
|
|
|
|
|
battery-status-symbol "!"))
|
|
|
|
|
|
((= tem 3) (setq battery-status "charging"
|
|
|
|
|
|
battery-status-symbol "+")))
|
|
|
|
|
|
(setq load-percentage (match-string 7))
|
|
|
|
|
|
(setq seconds (string-to-number (match-string 8)))
|
|
|
|
|
|
(and (string-equal (match-string 9) "min")
|
|
|
|
|
|
(setq seconds (* 60 seconds)))
|
|
|
|
|
|
(setq minutes (/ seconds 60)
|
|
|
|
|
|
hours (/ seconds 3600))
|
|
|
|
|
|
(setq remaining-time
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(format "%d:%02d" hours (% minutes 60)))))))
|
1998-02-25 22:44:24 +00:00
|
|
|
|
(list (cons ?v (or driver-version "N/A"))
|
|
|
|
|
|
(cons ?V (or bios-version "N/A"))
|
|
|
|
|
|
(cons ?I (or bios-interface "N/A"))
|
|
|
|
|
|
(cons ?L (or line-status "N/A"))
|
|
|
|
|
|
(cons ?B (or battery-status "N/A"))
|
|
|
|
|
|
(cons ?b (or battery-status-symbol ""))
|
|
|
|
|
|
(cons ?p (or load-percentage "N/A"))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(cons ?s (if seconds (number-to-string seconds) "N/A"))
|
|
|
|
|
|
(cons ?m (if minutes (number-to-string minutes) "N/A"))
|
|
|
|
|
|
(cons ?h (if hours (number-to-string hours) "N/A"))
|
1998-02-25 22:44:24 +00:00
|
|
|
|
(cons ?t (or remaining-time "N/A")))))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2003-09-06 19:28:08 +00:00
|
|
|
|
|
|
|
|
|
|
;;; `/proc/acpi/' interface for Linux.
|
|
|
|
|
|
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(rx-define battery--acpi-rate (&rest hour)
|
|
|
|
|
|
(: (group (+ digit)) " " (group ?m (in "AW") hour)))
|
|
|
|
|
|
(rx-define battery--acpi-capacity (battery--acpi-rate ?h))
|
|
|
|
|
|
|
2003-09-06 19:28:08 +00:00
|
|
|
|
(defun battery-linux-proc-acpi ()
|
2012-01-02 23:18:48 +00:00
|
|
|
|
"Get ACPI status information from Linux (the kernel).
|
2020-06-11 12:48:37 +00:00
|
|
|
|
This function works only with the `/proc/acpi/' interface
|
|
|
|
|
|
introduced in Linux version 2.4.20 and 2.6.0.
|
2003-09-06 19:28:08 +00:00
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%c Current capacity (mAh)
|
2020-06-11 12:48:37 +00:00
|
|
|
|
%r Current rate of charge or discharge
|
|
|
|
|
|
%L AC line status (verbose)
|
2003-09-06 19:28:08 +00:00
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%d Temperature (in degrees Celsius)
|
2005-07-01 11:03:19 +00:00
|
|
|
|
%p Battery load percentage
|
2006-03-11 15:08:42 +00:00
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(let ((design-capacity 0)
|
2006-01-19 17:49:13 +00:00
|
|
|
|
(last-full-capacity 0)
|
|
|
|
|
|
full-capacity
|
2004-09-18 21:33:44 +00:00
|
|
|
|
(warn 0)
|
|
|
|
|
|
(low 0)
|
|
|
|
|
|
capacity rate rate-type charging-state minutes hours)
|
|
|
|
|
|
;; ACPI provides information about each battery present in the system in
|
|
|
|
|
|
;; a separate subdirectory. We are going to merge the available
|
2004-09-18 11:50:18 +00:00
|
|
|
|
;; information together since displaying for a variable amount of
|
|
|
|
|
|
;; batteries seems overkill for format-strings.
|
|
|
|
|
|
(with-temp-buffer
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(dolist (dir (battery--files "/proc/acpi/battery/"))
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(insert-file-contents (expand-file-name "state" dir) nil nil nil t))
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(when (re-search-forward (rx "present:" (+ space) "yes" eol) nil t)
|
|
|
|
|
|
(and (re-search-forward (rx "charging state:" (+ space)
|
|
|
|
|
|
(group (not space) (* nonl)) eol)
|
|
|
|
|
|
nil t)
|
2006-03-11 15:08:42 +00:00
|
|
|
|
(member charging-state '("unknown" "charged" nil))
|
2004-09-18 21:33:44 +00:00
|
|
|
|
;; On most multi-battery systems, most of the time only one
|
|
|
|
|
|
;; battery is "charging"/"discharging", the others are
|
|
|
|
|
|
;; "unknown".
|
|
|
|
|
|
(setq charging-state (match-string 1)))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(when (re-search-forward (rx "present rate:" (+ space)
|
|
|
|
|
|
(battery--acpi-rate) eol)
|
2004-09-18 21:33:44 +00:00
|
|
|
|
nil t)
|
2012-04-10 23:24:31 +00:00
|
|
|
|
(setq rate (+ (or rate 0) (string-to-number (match-string 1))))
|
|
|
|
|
|
(when (> rate 0)
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(cond ((not rate-type)
|
|
|
|
|
|
(setq rate-type (match-string 2)))
|
|
|
|
|
|
((not (string= rate-type (match-string 2)))
|
|
|
|
|
|
(error "Inconsistent rate types (%s vs. %s)"
|
|
|
|
|
|
rate-type (match-string 2))))))
|
|
|
|
|
|
(when (re-search-forward (rx "remaining capacity:" (+ space)
|
|
|
|
|
|
battery--acpi-capacity eol)
|
2004-09-18 21:33:44 +00:00
|
|
|
|
nil t)
|
|
|
|
|
|
(setq capacity
|
|
|
|
|
|
(+ (or capacity 0) (string-to-number (match-string 1))))))
|
|
|
|
|
|
(goto-char (point-max))
|
|
|
|
|
|
(ignore-errors (insert-file-contents (expand-file-name "info" dir)))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(when (re-search-forward (rx "present:" (+ space) "yes" eol) nil t)
|
|
|
|
|
|
(when (re-search-forward (rx "design capacity:" (+ space)
|
|
|
|
|
|
battery--acpi-capacity eol)
|
2004-09-18 21:33:44 +00:00
|
|
|
|
nil t)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(cl-incf design-capacity (string-to-number (match-string 1))))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(when (re-search-forward (rx "last full capacity:" (+ space)
|
|
|
|
|
|
battery--acpi-capacity eol)
|
2006-01-19 17:49:13 +00:00
|
|
|
|
nil t)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(cl-incf last-full-capacity (string-to-number (match-string 1))))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(when (re-search-forward (rx "design capacity warning:" (+ space)
|
|
|
|
|
|
battery--acpi-capacity eol)
|
|
|
|
|
|
nil t)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(cl-incf warn (string-to-number (match-string 1))))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(when (re-search-forward (rx "design capacity low:" (+ space)
|
|
|
|
|
|
battery--acpi-capacity eol)
|
2004-09-18 21:33:44 +00:00
|
|
|
|
nil t)
|
Reduce use of (require 'cl).
* admin/bzrmerge.el: Use cl-lib.
* leim/quail/hangul.el: Don't require CL.
* leim/quail/ipa.el: Use cl-lib.
* vc/smerge-mode.el, vc/pcvs.el, vc/pcvs-util.el, vc/pcvs-info.el:
* vc/diff-mode.el, vc/cvs-status.el, uniquify.el, scroll-bar.el:
* register.el, progmodes/sh-script.el, net/gnutls.el, net/dbus.el:
* msb.el, mpc.el, minibuffer.el, international/ucs-normalize.el:
* international/quail.el, info-xref.el, imenu.el, image-mode.el:
* font-lock.el, filesets.el, edmacro.el, doc-view.el, bookmark.el:
* battery.el, avoid.el, abbrev.el: Use cl-lib.
* vc/pcvs-parse.el, vc/pcvs-defs.el, vc/log-view.el, vc/log-edit.el:
* vc/diff.el, simple.el, pcomplete.el, lpr.el, comint.el, loadhist.el:
* jit-lock.el, international/iso-ascii.el, info.el, frame.el, bs.el:
* emulation/crisp.el, electric.el, dired.el, cus-dep.el, composite.el:
* calculator.el, autorevert.el, apropos.el: Don't require CL.
* emacs-bytecomp.el (byte-recompile-directory, display-call-tree)
(byte-compile-unfold-bcf, byte-compile-check-variable):
* emacs-byte-opt.el (byte-compile-trueconstp)
(byte-compile-nilconstp):
* emacs-autoload.el (make-autoload): Use pcase.
* face-remap.el (text-scale-adjust): Simplify pcase patterns.
2012-07-10 11:51:54 +00:00
|
|
|
|
(cl-incf low (string-to-number (match-string 1)))))))
|
2006-01-19 17:49:13 +00:00
|
|
|
|
(setq full-capacity (if (> last-full-capacity 0)
|
|
|
|
|
|
last-full-capacity design-capacity))
|
2003-09-06 19:28:08 +00:00
|
|
|
|
(and capacity rate
|
2004-06-04 16:05:56 +00:00
|
|
|
|
(setq minutes (if (zerop rate) 0
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-23 02:32:31 +00:00
|
|
|
|
(floor (* (if (string= charging-state
|
|
|
|
|
|
"charging")
|
|
|
|
|
|
(- full-capacity capacity)
|
|
|
|
|
|
capacity)
|
|
|
|
|
|
60)
|
|
|
|
|
|
rate))
|
2003-09-06 19:28:08 +00:00
|
|
|
|
hours (/ minutes 60)))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(list (cons ?c (if capacity (number-to-string capacity) "N/A"))
|
2006-11-05 13:22:30 +00:00
|
|
|
|
(cons ?L (or (battery-search-for-one-match-in-files
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(mapcar (lambda (d) (expand-file-name "state" d))
|
|
|
|
|
|
(battery--files "/proc/acpi/ac_adapter/"))
|
|
|
|
|
|
(rx "state:" (+ space) (group (not space) (* nonl)) eol)
|
|
|
|
|
|
1)
|
2003-09-06 19:28:08 +00:00
|
|
|
|
"N/A"))
|
2006-11-05 13:22:30 +00:00
|
|
|
|
(cons ?d (or (battery-search-for-one-match-in-files
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(mapcar (lambda (d) (expand-file-name "temperature" d))
|
|
|
|
|
|
(battery--files "/proc/acpi/thermal_zone/"))
|
|
|
|
|
|
(rx "temperature:" (+ space) (group (+ digit)) " C" eol)
|
|
|
|
|
|
1)
|
2003-09-06 19:28:08 +00:00
|
|
|
|
"N/A"))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(cons ?r (if rate
|
|
|
|
|
|
(concat (number-to-string rate) " " rate-type)
|
|
|
|
|
|
"N/A"))
|
2003-09-06 19:28:08 +00:00
|
|
|
|
(cons ?B (or charging-state "N/A"))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(cons ?b (cond ((string= charging-state "charging") "+")
|
|
|
|
|
|
((and capacity (< capacity low)) "!")
|
|
|
|
|
|
((and capacity (< capacity warn)) "-")
|
|
|
|
|
|
("")))
|
|
|
|
|
|
(cons ?h (if hours (number-to-string hours) "N/A"))
|
|
|
|
|
|
(cons ?m (if minutes (number-to-string minutes) "N/A"))
|
|
|
|
|
|
(cons ?t (if minutes (format "%d:%02d" hours (% minutes 60)) "N/A"))
|
|
|
|
|
|
(cons ?p (if (and full-capacity capacity (> full-capacity 0))
|
|
|
|
|
|
(number-to-string (floor (* 100 capacity) full-capacity))
|
|
|
|
|
|
"N/A")))))
|
2003-09-06 19:28:08 +00:00
|
|
|
|
|
2008-08-08 17:46:49 +00:00
|
|
|
|
|
|
|
|
|
|
;;; `/sys/class/power_supply/BATN' interface for Linux.
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-linux-sysfs ()
|
2020-06-11 12:48:37 +00:00
|
|
|
|
"Get sysfs status information from Linux kernel.
|
2008-08-08 17:46:49 +00:00
|
|
|
|
This function works only with the new `/sys/class/power_supply/'
|
2020-06-11 12:48:37 +00:00
|
|
|
|
interface introduced in Linux version 2.4.25.
|
2008-08-08 17:46:49 +00:00
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%c Current capacity (mAh or mWh)
|
2020-06-11 12:48:37 +00:00
|
|
|
|
%r Current rate of charge or discharge
|
|
|
|
|
|
%L Power source (verbose)
|
2008-08-08 17:46:49 +00:00
|
|
|
|
%B Battery status (verbose)
|
2020-05-26 14:37:04 +00:00
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
2011-12-21 12:20:40 +00:00
|
|
|
|
%d Temperature (in degrees Celsius)
|
2008-08-08 17:46:49 +00:00
|
|
|
|
%p Battery load percentage
|
2011-12-21 12:20:40 +00:00
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(let (;; Some batteries report charges and current, others energy and power.
|
2015-03-07 04:42:10 +00:00
|
|
|
|
;; In order to reliably be able to combine those data, we convert them
|
|
|
|
|
|
;; all to energy/power (since we can't combine different charges if
|
|
|
|
|
|
;; they're not at the same voltage).
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(energy-full 0.0)
|
2015-03-07 04:42:10 +00:00
|
|
|
|
(energy-now 0.0)
|
|
|
|
|
|
(power-now 0.0)
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(voltage-now 10.8) ; Arbitrary default, in case the info is missing.
|
|
|
|
|
|
charging-state temperature hours percentage-now)
|
2008-08-08 17:46:49 +00:00
|
|
|
|
;; SysFS provides information about each battery present in the
|
|
|
|
|
|
;; system in a separate subdirectory. We are going to merge the
|
|
|
|
|
|
;; available information together.
|
|
|
|
|
|
(with-temp-buffer
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(dolist (dir (battery--find-linux-sysfs-batteries))
|
|
|
|
|
|
(ignore-errors
|
|
|
|
|
|
(insert-file-contents (expand-file-name "uevent" dir) nil nil nil t))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(when (re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_VOLTAGE_NOW=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq voltage-now (/ (string-to-number (match-string 1)) 1000000.0)))
|
|
|
|
|
|
(goto-char (point-min))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(when (re-search-forward "POWER_SUPPLY_PRESENT=1$" nil t)
|
|
|
|
|
|
(goto-char (point-min))
|
|
|
|
|
|
(and (re-search-forward "POWER_SUPPLY_STATUS=\\(.*\\)$" nil t)
|
|
|
|
|
|
(member charging-state '("Unknown" "Full" nil))
|
|
|
|
|
|
(setq charging-state (match-string 1)))
|
2014-03-23 00:08:47 +00:00
|
|
|
|
(goto-char (point-min))
|
2011-12-21 12:20:40 +00:00
|
|
|
|
(when (re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_\\(CURRENT\\|POWER\\)_NOW=\\([0-9]*\\)$"
|
|
|
|
|
|
nil t)
|
2015-03-07 04:42:10 +00:00
|
|
|
|
(cl-incf power-now
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-23 02:32:31 +00:00
|
|
|
|
(* (string-to-number (match-string 2))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
(if (eq (char-after (match-beginning 1)) ?C)
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-23 02:32:31 +00:00
|
|
|
|
voltage-now 1))))
|
2014-03-23 00:08:47 +00:00
|
|
|
|
(goto-char (point-min))
|
2011-12-21 12:20:40 +00:00
|
|
|
|
(when (re-search-forward "POWER_SUPPLY_TEMP=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq temperature (match-string 1)))
|
2014-03-23 00:08:47 +00:00
|
|
|
|
(goto-char (point-min))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(let (full-string now-string)
|
|
|
|
|
|
;; Sysfs may list either charge (mAh) or energy (mWh).
|
|
|
|
|
|
;; Keep track of both, and choose which to report later.
|
|
|
|
|
|
(cond ((and (re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_CHARGE_FULL=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq full-string (match-string 1))
|
|
|
|
|
|
(re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_CHARGE_NOW=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq now-string (match-string 1)))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
(cl-incf energy-full (* (string-to-number full-string)
|
|
|
|
|
|
voltage-now))
|
|
|
|
|
|
(cl-incf energy-now (* (string-to-number now-string)
|
|
|
|
|
|
voltage-now)))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
((and (goto-char (point-min))
|
2014-03-23 00:08:47 +00:00
|
|
|
|
(re-search-forward
|
2008-08-08 17:46:49 +00:00
|
|
|
|
"POWER_SUPPLY_ENERGY_FULL=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq full-string (match-string 1))
|
|
|
|
|
|
(re-search-forward
|
|
|
|
|
|
"POWER_SUPPLY_ENERGY_NOW=\\([0-9]*\\)$" nil t)
|
|
|
|
|
|
(setq now-string (match-string 1)))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
(cl-incf energy-full (string-to-number full-string))
|
|
|
|
|
|
(cl-incf energy-now (string-to-number now-string)))))
|
|
|
|
|
|
(unless (zerop power-now)
|
2011-12-21 12:20:40 +00:00
|
|
|
|
(let ((remaining (if (string= charging-state "Discharging")
|
|
|
|
|
|
energy-now
|
|
|
|
|
|
(- energy-full energy-now))))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
(setq hours (/ remaining power-now)))))))
|
2020-05-26 14:37:04 +00:00
|
|
|
|
(when (and (> energy-full 0) (> energy-now 0))
|
|
|
|
|
|
(setq percentage-now (/ (* 100 energy-now) energy-full)))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(list (cons ?c (if (or (> energy-full 0) (> energy-now 0))
|
|
|
|
|
|
(number-to-string (/ energy-now voltage-now))
|
|
|
|
|
|
"N/A"))
|
2015-03-07 04:42:10 +00:00
|
|
|
|
(cons ?r (if (> power-now 0.0)
|
|
|
|
|
|
(format "%.1f" (/ power-now 1000000.0))
|
|
|
|
|
|
"N/A"))
|
2011-12-21 12:20:40 +00:00
|
|
|
|
(cons ?m (if hours (format "%d" (* hours 60)) "N/A"))
|
|
|
|
|
|
(cons ?h (if hours (format "%d" hours) "N/A"))
|
|
|
|
|
|
(cons ?t (if hours
|
|
|
|
|
|
(format "%d:%02d" hours (* (- hours (floor hours)) 60))
|
|
|
|
|
|
"N/A"))
|
|
|
|
|
|
(cons ?d (or temperature "N/A"))
|
2008-08-08 17:46:49 +00:00
|
|
|
|
(cons ?B (or charging-state "N/A"))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(cons ?b (cond ((string= charging-state "Charging") "+")
|
|
|
|
|
|
((not percentage-now) "")
|
|
|
|
|
|
((< percentage-now battery-load-critical) "!")
|
|
|
|
|
|
((< percentage-now battery-load-low) "-")
|
|
|
|
|
|
("")))
|
|
|
|
|
|
(cons ?p (if percentage-now (format "%.1f" percentage-now) "N/A"))
|
|
|
|
|
|
(cons ?L (pcase (battery-search-for-one-match-in-files
|
|
|
|
|
|
'("/sys/class/power_supply/AC/online"
|
|
|
|
|
|
"/sys/class/power_supply/ACAD/online"
|
|
|
|
|
|
"/sys/class/power_supply/ADP1/online")
|
|
|
|
|
|
(rx (in "01")) 0)
|
|
|
|
|
|
("0" "BAT")
|
|
|
|
|
|
("1" "AC")
|
|
|
|
|
|
(_ "N/A"))))))
|
2012-12-16 03:17:50 +00:00
|
|
|
|
|
2016-12-02 10:17:38 +00:00
|
|
|
|
|
2020-06-11 12:49:31 +00:00
|
|
|
|
;;; UPower interface.
|
|
|
|
|
|
|
|
|
|
|
|
(defconst battery-upower-interface "org.freedesktop.UPower"
|
|
|
|
|
|
"Name of the UPower D-Bus interface.
|
|
|
|
|
|
See URL `https://upower.freedesktop.org/docs/UPower.html'.")
|
2020-02-06 07:35:12 +00:00
|
|
|
|
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(defconst battery-upower-path "/org/freedesktop/UPower"
|
|
|
|
|
|
"D-Bus object providing `battery-upower-interface'.")
|
2020-02-06 07:35:12 +00:00
|
|
|
|
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(defconst battery-upower-device-interface "org.freedesktop.UPower.Device"
|
|
|
|
|
|
"Name of the UPower Device D-Bus interface.
|
2020-02-06 07:35:12 +00:00
|
|
|
|
See URL `https://upower.freedesktop.org/docs/Device.html'.")
|
|
|
|
|
|
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(defconst battery-upower-device-path "/org/freedesktop/UPower/devices"
|
|
|
|
|
|
"D-Bus object providing `battery-upower-device-interface'.")
|
|
|
|
|
|
|
|
|
|
|
|
(defvar battery--upower-signals nil
|
|
|
|
|
|
"Handles for UPower signal subscriptions.")
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery--upower-signal-handler (&rest _)
|
|
|
|
|
|
"Update battery status on receiving a UPower D-Bus signal."
|
|
|
|
|
|
(timer-event-handler battery-update-timer))
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery--upower-props-changed (_interface changed _invalidated)
|
|
|
|
|
|
"Update status when system starts/stops running on battery.
|
|
|
|
|
|
Intended as a UPower PropertiesChanged signal handler."
|
|
|
|
|
|
(when (assoc "OnBattery" changed)
|
|
|
|
|
|
(battery--upower-signal-handler)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery--upower-unsubscribe ()
|
|
|
|
|
|
"Unsubscribe from UPower device change signals."
|
|
|
|
|
|
(mapc #'dbus-unregister-object battery--upower-signals)
|
|
|
|
|
|
(setq battery--upower-signals ()))
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery--upower-subsribe ()
|
|
|
|
|
|
"Subscribe to UPower device change signals."
|
|
|
|
|
|
(push (dbus-register-signal :system battery-upower-service
|
|
|
|
|
|
battery-upower-path
|
|
|
|
|
|
dbus-interface-properties
|
|
|
|
|
|
"PropertiesChanged"
|
|
|
|
|
|
#'battery--upower-props-changed)
|
|
|
|
|
|
battery--upower-signals)
|
|
|
|
|
|
(dolist (method '("DeviceAdded" "DeviceRemoved"))
|
|
|
|
|
|
(push (dbus-register-signal :system battery-upower-service
|
|
|
|
|
|
battery-upower-path
|
|
|
|
|
|
battery-upower-interface
|
|
|
|
|
|
method #'battery--upower-signal-handler)
|
|
|
|
|
|
battery--upower-signals)))
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery--upower-device-properties (device)
|
2020-02-06 07:35:12 +00:00
|
|
|
|
"Return value for all available properties for the UPower DEVICE."
|
|
|
|
|
|
(dbus-get-all-properties
|
2020-06-11 12:49:31 +00:00
|
|
|
|
:system battery-upower-service
|
|
|
|
|
|
(expand-file-name device battery-upower-device-path)
|
|
|
|
|
|
battery-upower-device-interface))
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery--upower-devices ()
|
|
|
|
|
|
"List all UPower devices according to `battery-upower-device'."
|
|
|
|
|
|
(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.
|
|
|
|
|
|
This is an extension of the UPower DisplayDevice algorithm for
|
|
|
|
|
|
merging multiple battery states into one. PROPS is an alist of
|
|
|
|
|
|
battery properties from `battery-upower-device-interface', and
|
|
|
|
|
|
STATE is a symbol representing the state to merge with."
|
|
|
|
|
|
;; Map UPower enum into our printable symbols.
|
|
|
|
|
|
(let* ((new (pcase (cdr (assoc "State" props))
|
|
|
|
|
|
(1 'charging)
|
|
|
|
|
|
(2 'discharging)
|
|
|
|
|
|
(3 'empty)
|
|
|
|
|
|
(4 'fully-charged)
|
|
|
|
|
|
(5 'pending-charge)
|
|
|
|
|
|
(6 'pending-discharge)))
|
|
|
|
|
|
;; Unknown state represented by nil.
|
|
|
|
|
|
(either (delq nil (list new state))))
|
|
|
|
|
|
;; Earlier states override later ones.
|
|
|
|
|
|
(car (cond ((memq 'charging either))
|
|
|
|
|
|
((memq 'discharging either))
|
|
|
|
|
|
((memq 'pending-charge either))
|
|
|
|
|
|
((memq 'pending-discharge either))
|
|
|
|
|
|
;; Only options left are full or empty,
|
|
|
|
|
|
;; but if they conflict return nil.
|
|
|
|
|
|
((null (cdr either)) either)
|
|
|
|
|
|
((apply #'eq either) either)))))
|
2016-12-02 10:17:38 +00:00
|
|
|
|
|
|
|
|
|
|
(defun battery-upower ()
|
2020-06-11 12:49:31 +00:00
|
|
|
|
"Get battery status from UPower D-Bus interface.
|
|
|
|
|
|
This function works only in systems that provide a UPower D-Bus
|
|
|
|
|
|
service.
|
2016-12-02 10:17:38 +00:00
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%c Current capacity (mWh)
|
2020-06-11 12:49:31 +00:00
|
|
|
|
%r Current rate of charge or discharge
|
|
|
|
|
|
%L AC line status (verbose)
|
2016-12-02 10:17:38 +00:00
|
|
|
|
%B Battery status (verbose)
|
2020-02-06 07:35:12 +00:00
|
|
|
|
%b Battery status: empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
2020-06-11 12:49:31 +00:00
|
|
|
|
%d Temperature (in degrees Celsius)
|
|
|
|
|
|
%p Battery load percentage
|
2016-12-02 10:17:38 +00:00
|
|
|
|
%s Remaining time (to charge or discharge) in seconds
|
|
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(let ((count 0) props type line-status state load temperature
|
|
|
|
|
|
secs mins hrs total-energy total-rate total-tte total-ttf)
|
|
|
|
|
|
;; Merge information from all available or specified UPower
|
|
|
|
|
|
;; devices like other `battery-status-function's.
|
|
|
|
|
|
(dolist (device (battery--upower-devices))
|
|
|
|
|
|
(setq props (battery--upower-device-properties device))
|
|
|
|
|
|
(setq type (cdr (assoc "Type" props)))
|
|
|
|
|
|
(cond
|
|
|
|
|
|
((and (eq type 1) (not (eq line-status 'online)))
|
|
|
|
|
|
;; It's a line power device: `online' if currently providing
|
|
|
|
|
|
;; power, any other non-nil value if simply present.
|
|
|
|
|
|
(setq line-status (if (cdr (assoc "Online" props)) 'online t)))
|
|
|
|
|
|
((and (eq type 2) (cdr (assoc "IsPresent" props)))
|
|
|
|
|
|
;; It's a battery.
|
|
|
|
|
|
(setq count (1+ count))
|
|
|
|
|
|
(setq state (battery--upower-state props state))
|
|
|
|
|
|
(let ((energy (cdr (assoc "Energy" props)))
|
|
|
|
|
|
(rate (cdr (assoc "EnergyRate" props)))
|
|
|
|
|
|
(percent (cdr (assoc "Percentage" props)))
|
|
|
|
|
|
(temp (cdr (assoc "Temperature" props)))
|
|
|
|
|
|
(tte (cdr (assoc "TimeToEmpty" props)))
|
|
|
|
|
|
(ttf (cdr (assoc "TimeToFull" props))))
|
|
|
|
|
|
(when energy (setq total-energy (+ (or total-energy 0) energy)))
|
|
|
|
|
|
(when rate (setq total-rate (+ (or total-rate 0) rate)))
|
|
|
|
|
|
(when percent (setq load (+ (or load 0) percent)))
|
|
|
|
|
|
(when temp (setq temperature (+ (or temperature 0) temp)))
|
|
|
|
|
|
(when tte (setq total-tte (+ (or total-tte 0) tte)))
|
|
|
|
|
|
(when ttf (setq total-ttf (+ (or total-ttf 0) ttf)))))))
|
|
|
|
|
|
(when (> count 1)
|
|
|
|
|
|
;; Averages over multiple batteries.
|
|
|
|
|
|
(when load (setq load (/ load count)))
|
|
|
|
|
|
(when temperature (setq temperature (/ temperature count))))
|
|
|
|
|
|
(when (setq secs (if (eq line-status 'online) total-ttf total-tte))
|
|
|
|
|
|
(setq mins (/ secs 60))
|
|
|
|
|
|
(setq hrs (/ secs 3600)))
|
|
|
|
|
|
(list (cons ?c (if total-energy
|
|
|
|
|
|
(format "%.0f" (* total-energy 1000))
|
2020-02-06 07:35:12 +00:00
|
|
|
|
"N/A"))
|
2020-06-11 12:49:31 +00:00
|
|
|
|
(cons ?r (if total-rate (format "%.1f W" total-rate) "N/A"))
|
|
|
|
|
|
(cons ?L (cond ((eq line-status 'online) "on-line")
|
|
|
|
|
|
(line-status "off-line")
|
|
|
|
|
|
("N/A")))
|
|
|
|
|
|
(cons ?B (format "%s" (or state 'unknown)))
|
|
|
|
|
|
(cons ?b (cond ((eq state 'charging) "+")
|
|
|
|
|
|
((and load (< load battery-load-critical)) "!")
|
|
|
|
|
|
((and load (< load battery-load-low)) "-")
|
|
|
|
|
|
("")))
|
|
|
|
|
|
;; Zero usually means unknown.
|
|
|
|
|
|
(cons ?d (if (and temperature (/= temperature 0))
|
|
|
|
|
|
(format "%.0f" temperature)
|
|
|
|
|
|
"N/A"))
|
|
|
|
|
|
(cons ?p (if load (format "%.0f" load) "N/A"))
|
|
|
|
|
|
(cons ?s (if secs (number-to-string secs) "N/A"))
|
|
|
|
|
|
(cons ?m (if mins (number-to-string mins) "N/A"))
|
|
|
|
|
|
(cons ?h (if hrs (number-to-string hrs) "N/A"))
|
|
|
|
|
|
(cons ?t (if hrs (format "%d:%02d" hrs (% mins 60)) "N/A")))))
|
2016-12-02 10:17:38 +00:00
|
|
|
|
|
2012-12-16 03:17:50 +00:00
|
|
|
|
|
|
|
|
|
|
;;; `apm' interface for BSD.
|
2020-06-11 12:48:37 +00:00
|
|
|
|
|
2012-12-16 03:17:50 +00:00
|
|
|
|
(defun battery-bsd-apm ()
|
|
|
|
|
|
"Get APM status information from BSD apm binary.
|
|
|
|
|
|
The following %-sequences are provided:
|
2020-06-11 12:48:37 +00:00
|
|
|
|
%P Advanced power saving mode state (verbose)
|
2012-12-16 03:17:50 +00:00
|
|
|
|
%L AC line status (verbose)
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
2020-06-11 12:48:37 +00:00
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%p Battery load percentage
|
|
|
|
|
|
%s Remaining time (to charge or discharge) in seconds
|
|
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
2012-12-16 03:17:50 +00:00
|
|
|
|
(let* ((os-name (car (split-string
|
2019-03-13 14:10:19 +00:00
|
|
|
|
;; FIXME: Can't we use something like `system-type'?
|
|
|
|
|
|
(shell-command-to-string "/usr/bin/uname"))))
|
|
|
|
|
|
(apm-flag (pcase os-name
|
|
|
|
|
|
("OpenBSD" "mP")
|
|
|
|
|
|
("FreeBSD" "st")
|
|
|
|
|
|
(_ "ms")))
|
|
|
|
|
|
(apm-cmd (concat "/usr/sbin/apm -abl" apm-flag))
|
|
|
|
|
|
(apm-output (split-string (shell-command-to-string apm-cmd)))
|
2019-03-13 14:27:46 +00:00
|
|
|
|
(indices (pcase os-name
|
|
|
|
|
|
;; FreeBSD's manpage documents that multiple
|
|
|
|
|
|
;; outputs are ordered by "the order in which
|
|
|
|
|
|
;; they're listed in the manpage", which is alphabetical
|
|
|
|
|
|
;; and is also the order in which we pass them.
|
|
|
|
|
|
("FreeBSD" '((ac . 0)
|
|
|
|
|
|
(battery-status . 1)
|
|
|
|
|
|
(battery-percent . 2)
|
|
|
|
|
|
(apm-mode . 3)
|
|
|
|
|
|
(battery-life . 4)))
|
|
|
|
|
|
;; For NetBSD and OpenBSD, the manpage doesn't document
|
|
|
|
|
|
;; the order. The previous code used this order, so let's
|
|
|
|
|
|
;; assume it's right.
|
|
|
|
|
|
(_ '((ac . 3)
|
|
|
|
|
|
(battery-status . 0)
|
|
|
|
|
|
(battery-percent . 1)
|
|
|
|
|
|
(apm-mode . 4)
|
|
|
|
|
|
(battery-life . 2)))))
|
2019-03-13 14:10:19 +00:00
|
|
|
|
;; Battery status
|
|
|
|
|
|
(battery-status
|
2019-03-13 14:27:46 +00:00
|
|
|
|
(pcase (string-to-number
|
|
|
|
|
|
(nth (alist-get 'battery-status indices) apm-output))
|
|
|
|
|
|
(0 '("high" . ""))
|
|
|
|
|
|
(1 '("low" . "-"))
|
|
|
|
|
|
(2 '("critical" . "!"))
|
|
|
|
|
|
(3 '("charging" . "+"))
|
|
|
|
|
|
(4 '("absent" . nil))))
|
2019-03-13 14:10:19 +00:00
|
|
|
|
;; Battery percentage
|
2019-03-13 14:27:46 +00:00
|
|
|
|
(battery-percentage
|
|
|
|
|
|
(nth (alist-get 'battery-percent indices) apm-output))
|
2019-03-13 14:10:19 +00:00
|
|
|
|
;; Battery life
|
2019-03-13 14:27:46 +00:00
|
|
|
|
(battery-life (nth (alist-get 'battery-life indices) apm-output))
|
2019-03-13 14:10:19 +00:00
|
|
|
|
;; AC status
|
|
|
|
|
|
(line-status
|
2019-03-13 14:27:46 +00:00
|
|
|
|
(pcase (string-to-number (nth (alist-get 'ac indices) apm-output))
|
|
|
|
|
|
(0 "disconnected")
|
|
|
|
|
|
(1 "connected")
|
|
|
|
|
|
(2 "backup power")))
|
2019-03-13 14:10:19 +00:00
|
|
|
|
;; Advanced power savings mode
|
|
|
|
|
|
(apm-mode
|
2019-03-13 14:27:46 +00:00
|
|
|
|
(let ((apm (string-to-number
|
|
|
|
|
|
(nth (alist-get 'apm-mode indices) apm-output))))
|
2019-03-13 14:10:19 +00:00
|
|
|
|
(if (string= os-name "OpenBSD")
|
2019-03-13 14:27:46 +00:00
|
|
|
|
(pcase apm
|
|
|
|
|
|
(0 "manual")
|
|
|
|
|
|
(1 "automatic")
|
|
|
|
|
|
(2 "cool running"))
|
|
|
|
|
|
(if (eql apm 1) "on" "off"))))
|
2012-12-16 03:17:50 +00:00
|
|
|
|
seconds minutes hours remaining-time)
|
|
|
|
|
|
(unless (member battery-life '("unknown" "-1"))
|
|
|
|
|
|
(if (member os-name '("OpenBSD" "NetBSD"))
|
|
|
|
|
|
(setq minutes (string-to-number battery-life)
|
|
|
|
|
|
seconds (* 60 minutes))
|
|
|
|
|
|
(setq seconds (string-to-number battery-life)
|
Avoid some double-rounding of Lisp timestamps
Also, simplify some time-related Lisp timestamp code
while we’re in the neighborhood.
* lisp/battery.el (battery-linux-proc-acpi)
(battery-linux-sysfs, battery-upower, battery-bsd-apm):
* lisp/calendar/timeclock.el (timeclock-seconds-to-string)
(timeclock-log, timeclock-last-period)
(timeclock-entry-length, timeclock-entry-list-span)
(timeclock-find-discrep, timeclock-generate-report):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/completion.el (cmpl-hours-since-origin):
* lisp/ecomplete.el (ecomplete-decay-1):
* lisp/emacs-lisp/ert.el (ert--results-update-stats-display)
(ert--results-update-stats-display-maybe):
* lisp/emacs-lisp/timer-list.el (list-timers):
* lisp/emacs-lisp/timer.el (timer-until)
(timer-event-handler):
* lisp/erc/erc-backend.el (erc-server-send-ping)
(erc-server-send-queue, erc-handle-parsed-server-response)
(erc-handle-unknown-server-response):
* lisp/erc/erc-track.el (erc-buffer-visible):
* lisp/erc/erc.el (erc-lurker-cleanup, erc-lurker-p)
(erc-cmd-PING, erc-send-current-line):
* lisp/eshell/em-pred.el (eshell-pred-file-time):
* lisp/eshell/em-unix.el (eshell-show-elapsed-time):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event:org-timestamp):
* lisp/gnus/gnus-int.el (gnus-backend-trace):
* lisp/gnus/gnus-sum.el (gnus-user-date):
* lisp/gnus/mail-source.el (mail-source-delete-crash-box):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/ibuf-ext.el (ibuffer-mark-old-buffers):
* lisp/gnus/nnmaildir.el (nnmaildir--scan):
* lisp/mouse.el (mouse--down-1-maybe-follows-link)
(mouse--click-1-maybe-follows-link):
* lisp/mpc.el (mpc--faster-toggle):
* lisp/net/rcirc.el (rcirc-handler-ctcp-KEEPALIVE)
(rcirc-sentinel):
* lisp/net/tramp-cache.el (tramp-get-file-property):
* lisp/net/tramp-sh.el (tramp-sh-handle-file-newer-than-file-p)
(tramp-maybe-open-connection):
* lisp/net/tramp-smb.el (tramp-smb-maybe-open-connection):
* lisp/org/org-clock.el (org-clock-resolve):
(org-resolve-clocks, org-clock-in, org-clock-out, org-clock-sum):
* lisp/org/org-timer.el (org-timer-start)
(org-timer-pause-or-continue, org-timer-seconds):
* lisp/org/org.el (org-evaluate-time-range):
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
* lisp/pixel-scroll.el (pixel-scroll-in-rush-p):
* lisp/play/hanoi.el (hanoi-move-ring):
* lisp/proced.el (proced-format-time):
* lisp/progmodes/cpp.el (cpp-progress-message):
* lisp/progmodes/flymake.el (flymake--handle-report):
* lisp/progmodes/js.el (js--wait-for-matching-output):
* lisp/subr.el (progress-reporter-do-update):
* lisp/term/xterm.el (xterm--read-event-for-query):
* lisp/time.el (display-time-update, emacs-uptime):
* lisp/tooltip.el (tooltip-delay):
* lisp/url/url-cookie.el (url-cookie-parse-file-netscape):
* lisp/url/url-queue.el (url-queue-prune-old-entries):
* lisp/url/url.el (url-retrieve-synchronously):
* lisp/xt-mouse.el (xterm-mouse-event):
Avoid double-rounding of time-related values. Simplify.
* lisp/calendar/icalendar.el (icalendar--decode-isodatetime):
When hoping for the best (unlikely), use a better decoded time.
(icalendar--convert-sexp-to-ical): Avoid unnecessary encode-time.
* lisp/calendar/timeclock.el (timeclock-when-to-leave):
* lisp/cedet/ede/detect.el (ede-detect-qtest):
* lisp/desktop.el (desktop-create-buffer):
* lisp/emacs-lisp/benchmark.el (benchmark-elapse):
* lisp/gnus/gnus-art.el (article-lapsed-string):
* lisp/gnus/gnus-group.el (gnus-group-timestamp-delta):
* lisp/gnus/nnmail.el (nnmail-expired-article-p):
* lisp/gnus/nnmaildir.el (nnmaildir-request-expire-articles):
* lisp/nxml/rng-maint.el (rng-time-function):
* lisp/org/org-clock.el (org-clock-get-clocked-time)
(org-clock-resolve, org-resolve-clocks, org-resolve-clocks-if-idle):
* lisp/org/org-habit.el (org-habit-insert-consistency-graphs):
* lisp/progmodes/vhdl-mode.el (vhdl-update-progress-info)
(vhdl-fix-case-region-1):
Use time-since instead of open-coding most of it.
* lisp/erc/erc-dcc.el (erc-dcc-get-sentinel):
* lisp/erc/erc.el (erc-string-to-emacs-time, erc-time-gt):
Now obsolete. All uses changed.
(erc-time-diff): Accept all Lisp time values.
All uses changed.
* lisp/gnus/gnus-demon.el (gnus-demon-idle-since):
* lisp/gnus/gnus-score.el (gnus-score-headers):
* lisp/gnus/nneething.el (nneething-make-head):
* lisp/gnus/nnheader.el (nnheader-message-maybe):
* lisp/gnus/nnimap.el (nnimap-keepalive):
* lisp/image.el (image-animate-timeout):
* lisp/mail/feedmail.el (feedmail-rfc822-date):
* lisp/net/imap.el (imap-wait-for-tag):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/net/rcirc.el (rcirc-handler-317, rcirc-handler-333):
* lisp/obsolete/xesam.el (xesam-refresh-entry):
* lisp/org/org-agenda.el (org-agenda-show-clocking-issues)
(org-agenda-check-clock-gap, org-agenda-to-appt):
* lisp/org/org-capture.el (org-capture-set-target-location):
* lisp/org/org-clock.el (org-clock-resolve-clock)
(org-clocktable-steps):
* lisp/org/org-colview.el (org-columns-edit-value)
(org-columns, org-agenda-columns):
* lisp/org/org-duration.el (org-duration-from-minutes):
* lisp/org/org-element.el (org-element-cache-sync-duration)
(org-element-cache-sync-break)
(org-element--cache-interrupt-p, org-element--cache-sync):
* lisp/org/org-habit.el (org-habit-get-faces)
* lisp/org/org-indent.el (org-indent-add-properties):
* lisp/org/org-table.el (org-table-sum):
* lisp/org/org-timer.el (org-timer-show-remaining-time)
(org-timer-set-timer):
* lisp/org/org.el (org-babel-load-file, org-today)
(org-auto-repeat-maybe, org-2ft, org-time-stamp)
(org-read-date-analyze, org-time-stamp-to-now)
(org-small-year-to-year, org-goto-calendar):
* lisp/org/ox.el (org-export-insert-default-template):
* lisp/ses.el (ses--time-check):
* lisp/type-break.el (type-break-time-warning)
(type-break-statistics, type-break-demo-boring):
* lisp/url/url-cache.el (url-cache-expired)
(url-cache-prune-cache):
* lisp/vc/vc-git.el (vc-git-stash-snapshot):
* lisp/erc/erc-match.el (erc-log-matches-come-back):
Simplify.
2019-02-23 02:32:31 +00:00
|
|
|
|
minutes (truncate seconds 60)))
|
|
|
|
|
|
(setq hours (truncate minutes 60)
|
2020-06-11 12:48:37 +00:00
|
|
|
|
remaining-time (format "%d:%02d" hours (% minutes 60))))
|
2012-12-16 03:17:50 +00:00
|
|
|
|
(list (cons ?L (or line-status "N/A"))
|
|
|
|
|
|
(cons ?B (or (car battery-status) "N/A"))
|
|
|
|
|
|
(cons ?b (or (cdr battery-status) "N/A"))
|
|
|
|
|
|
(cons ?p (if (string= battery-percentage "255")
|
|
|
|
|
|
"N/A"
|
|
|
|
|
|
battery-percentage))
|
|
|
|
|
|
(cons ?P (or apm-mode "N/A"))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(cons ?s (if seconds (number-to-string seconds) "N/A"))
|
|
|
|
|
|
(cons ?m (if minutes (number-to-string minutes) "N/A"))
|
|
|
|
|
|
(cons ?h (if hours (number-to-string hours) "N/A"))
|
2012-12-16 03:17:50 +00:00
|
|
|
|
(cons ?t (or remaining-time "N/A")))))
|
|
|
|
|
|
|
2005-07-05 08:14:42 +00:00
|
|
|
|
|
2016-11-06 07:33:43 +00:00
|
|
|
|
;;; `pmset' interface for Darwin (macOS).
|
2005-07-05 08:14:42 +00:00
|
|
|
|
|
|
|
|
|
|
(defun battery-pmset ()
|
|
|
|
|
|
"Get battery status information using `pmset'.
|
|
|
|
|
|
|
|
|
|
|
|
The following %-sequences are provided:
|
|
|
|
|
|
%L Power source (verbose)
|
|
|
|
|
|
%B Battery status (verbose)
|
|
|
|
|
|
%b Battery status, empty means high, `-' means low,
|
|
|
|
|
|
`!' means critical, and `+' means charging
|
|
|
|
|
|
%p Battery load percentage
|
2020-06-11 12:48:37 +00:00
|
|
|
|
%m Remaining time (to charge or discharge) in minutes
|
|
|
|
|
|
%h Remaining time (to charge or discharge) in hours
|
|
|
|
|
|
%t Remaining time (to charge or discharge) in the form `h:min'"
|
|
|
|
|
|
(let ( power-source load-percentage battery-status battery-status-symbol
|
|
|
|
|
|
remaining-time hours minutes )
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(ignore-errors (call-process "pmset" nil t nil "-g" "ps"))
|
|
|
|
|
|
(goto-char (point-min))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(when (re-search-forward ;; Handle old typo in output.
|
|
|
|
|
|
"\\(?:Currentl?y\\|Now\\) drawing from '\\(AC\\|Battery\\) Power'"
|
|
|
|
|
|
nil t)
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(setq power-source (match-string 1))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(when (re-search-forward (rx bol " -InternalBattery-0" (+ space)
|
|
|
|
|
|
(* "(id=" (+ digit) ")" (+ space)))
|
|
|
|
|
|
nil t)
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(when (looking-at "\\([0-9]\\{1,3\\}\\)%")
|
|
|
|
|
|
(setq load-percentage (match-string 1))
|
|
|
|
|
|
(goto-char (match-end 0))
|
2020-06-11 12:48:37 +00:00
|
|
|
|
(cond ((looking-at-p "; charging")
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(setq battery-status "charging"
|
|
|
|
|
|
battery-status-symbol "+"))
|
|
|
|
|
|
((< (string-to-number load-percentage) battery-load-critical)
|
|
|
|
|
|
(setq battery-status "critical"
|
|
|
|
|
|
battery-status-symbol "!"))
|
2016-02-20 07:33:48 +00:00
|
|
|
|
((< (string-to-number load-percentage) battery-load-low)
|
|
|
|
|
|
(setq battery-status "low"
|
|
|
|
|
|
battery-status-symbol "-"))
|
2005-07-05 08:14:42 +00:00
|
|
|
|
(t
|
|
|
|
|
|
(setq battery-status "high"
|
|
|
|
|
|
battery-status-symbol "")))
|
|
|
|
|
|
(when (re-search-forward "\\(\\([0-9]+\\):\\([0-9]+\\)\\) remaining" nil t)
|
|
|
|
|
|
(setq remaining-time (match-string 1))
|
|
|
|
|
|
(let ((h (string-to-number (match-string 2)))
|
|
|
|
|
|
(m (string-to-number (match-string 3))))
|
|
|
|
|
|
(setq hours (number-to-string (+ h (if (< m 30) 0 1)))
|
|
|
|
|
|
minutes (number-to-string (+ (* h 60) m)))))))))
|
|
|
|
|
|
(list (cons ?L (or power-source "N/A"))
|
|
|
|
|
|
(cons ?p (or load-percentage "N/A"))
|
|
|
|
|
|
(cons ?B (or battery-status "N/A"))
|
|
|
|
|
|
(cons ?b (or battery-status-symbol ""))
|
|
|
|
|
|
(cons ?h (or hours "N/A"))
|
|
|
|
|
|
(cons ?m (or minutes "N/A"))
|
|
|
|
|
|
(cons ?t (or remaining-time "N/A")))))
|
|
|
|
|
|
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
;;; Private functions.
|
|
|
|
|
|
|
|
|
|
|
|
(defun battery-format (format alist)
|
|
|
|
|
|
"Substitute %-sequences in FORMAT."
|
Fix and extend format-spec (bug#41758)
* lisp/format-spec.el: Use lexical-binding. Remove dependence on
subr-x.el.
(format-spec-make): Clarify docstring.
(format-spec--parse-modifiers): Rename to...
(format-spec--parse-flags): ...this and simplify. In particular,
don't bother parsing :space-pad which is redundant and unused.
(format-spec--pad): Remove, replacing with...
(format-spec--do-flags): ...this new helper function which performs
more of format-spec's supported text manipulation.
(format-spec): Autoload. Allow optional argument to take on special
values 'ignore' and 'delete' for more control over what happens when
a replacement for a format specification isn't provided. Bring back
proper support for a precision modifier similar to that of 'format'.
* lisp/battery.el (battery-format): Rewrite in terms of format-spec.
(battery-echo-area-format, battery-mode-line-format): Mention
support of format-spec syntax in docstrings.
* doc/lispref/strings.texi (Custom Format Strings):
* etc/NEWS: Document and announce these changes.
* lisp/dired-aux.el (dired-do-compress-to):
* lisp/erc/erc-match.el (erc-log-matches):
* lisp/erc/erc.el (erc-update-mode-line-buffer):
* lisp/gnus/gnus-sieve.el (gnus-sieve-update):
* lisp/gnus/gssapi.el (open-gssapi-stream):
* lisp/gnus/mail-source.el (mail-source-fetch-file)
(mail-source-fetch-directory, mail-source-fetch-pop)
(mail-source-fetch-imap):
* lisp/gnus/message.el (message-insert-formatted-citation-line):
* lisp/image-dired.el:
* lisp/net/eww.el:
* lisp/net/imap.el (imap-kerberos4-open, imap-gssapi-open)
(imap-shell-open):
* lisp/net/network-stream.el (network-stream-open-shell):
* lisp/obsolete/tls.el (open-tls-stream):
* lisp/textmodes/tex-mode.el:
Remove extraneous loads and autoloads of format-spec now that it is
autoloaded and simplify its uses where possible.
* test/lisp/battery-tests.el (battery-format): Test new format-spec
support.
* test/lisp/format-spec-tests.el (test-format-spec): Rename to...
(format-spec) ...this, extending test cases.
(test-format-unknown): Rename to...
(format-spec-unknown): ...this, extending test cases.
(test-format-modifiers): Rename to...
(format-spec-flags): ...this.
(format-spec-make, format-spec-parse-flags, format-spec-do-flags)
(format-spec-do-flags-truncate, format-spec-do-flags-pad)
(format-spec-do-flags-chop, format-spec-do-flags-case): New tests.
2020-05-29 18:56:14 +00:00
|
|
|
|
(format-spec format alist 'delete))
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
2006-11-05 13:22:30 +00:00
|
|
|
|
(defun battery-search-for-one-match-in-files (files regexp match-num)
|
|
|
|
|
|
"Search REGEXP in the content of the files listed in FILES.
|
2007-01-08 23:00:24 +00:00
|
|
|
|
If a match occurred, return the parenthesized expression numbered by
|
2006-11-05 13:22:30 +00:00
|
|
|
|
MATCH-NUM in the match. Otherwise, return nil."
|
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
|
(catch 'found
|
|
|
|
|
|
(dolist (file files)
|
|
|
|
|
|
(and (ignore-errors (insert-file-contents file nil nil nil 'replace))
|
|
|
|
|
|
(re-search-forward regexp nil t)
|
|
|
|
|
|
(throw 'found (match-string match-num)))))))
|
|
|
|
|
|
|
1997-06-22 20:08:32 +00:00
|
|
|
|
|
|
|
|
|
|
(provide 'battery)
|
|
|
|
|
|
|
|
|
|
|
|
;;; battery.el ends here
|