summaryrefslogtreecommitdiff
path: root/lisp/mail
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/mail
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/mail')
-rw-r--r--lisp/mail/emacsbug.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index ce3c50bce2b..86aefe4a6dd 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -72,7 +72,7 @@
(defvar message-strip-special-text-properties)
(defun report-emacs-bug-can-use-osx-open ()
- "Return non-nil if the OS X \"open\" command is available for mailing."
+ "Return non-nil if the macOS \"open\" command is available for mailing."
(and (featurep 'ns)
(equal (executable-find "open") "/usr/bin/open")
(memq system-type '(darwin))))
@@ -107,7 +107,7 @@ This requires you to be running either Gnome, KDE, or Xfce4."
(defun report-emacs-bug-insert-to-mailer ()
"Send the message to your preferred mail client.
-This requires either the OS X \"open\" command, or the freedesktop
+This requires either the macOS \"open\" command, or the freedesktop
\"xdg-email\" command to be available."
(interactive)
(save-excursion