summaryrefslogtreecommitdiff
path: root/lisp/battery.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-11-06 00:33:43 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-11-06 00:42:03 -0700
commitdc152c54f4e44f5f2040883b03f71ff6aa66c893 (patch)
tree7b4f0336a1f03e7a53d980000a42568b10907409 /lisp/battery.el
parent84c53436ab25b6c8f76c133e59b34e533ea33cc7 (diff)
downloademacs-dc152c54f4e44f5f2040883b03f71ff6aa66c893.tar.gz
Modernize usage of 'macOS' in doc and comments
Apple changed the spelling of its operating system again, to "macOS", effective with macOS 10.12 Sierra (2016-09-20). Change Emacs documentation and comments to match this. Stick with older OS spellings ("OS X", "Mac OS X") when talking about older releases where the older names are more correct.
Diffstat (limited to 'lisp/battery.el')
-rw-r--r--lisp/battery.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/battery.el b/lisp/battery.el
index b5e312f6c3e..20f3017fc45 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -22,10 +22,10 @@
;;; Commentary:
-;; There is at present support for GNU/Linux, OS X and Windows. This
+;; There is at present support for GNU/Linux, macOS and Windows. This
;; library supports both the `/proc/apm' file format of Linux version
;; 1.3.58 or newer and the `/proc/acpi/' directory structure of Linux
-;; 2.4.20 and 2.6. Darwin (OS X) is supported by using the `pmset'
+;; 2.4.20 and 2.6. Darwin (macOS) is supported by using the `pmset'
;; program. Windows is supported by the GetSystemPowerStatus API call.
;;; Code:
@@ -600,7 +600,7 @@ The following %-sequences are provided:
(cons ?t (or remaining-time "N/A")))))
-;;; `pmset' interface for Darwin (OS X).
+;;; `pmset' interface for Darwin (macOS).
(defun battery-pmset ()
"Get battery status information using `pmset'.