From dc152c54f4e44f5f2040883b03f71ff6aa66c893 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 6 Nov 2016 00:33:43 -0700 Subject: 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. --- lisp/progmodes/python.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/progmodes/python.el') diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 3fae3987b22..8ec9febe5c9 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2414,7 +2414,7 @@ banner and the initial prompt are received separately." (defun python-shell-comint-end-of-output-p (output) "Return non-nil if OUTPUT is ends with input prompt." (string-match - ;; XXX: It seems on OSX an extra carriage return is attached + ;; XXX: It seems on macOS an extra carriage return is attached ;; at the end of output, this handles that too. (concat "\r?\n?" -- cgit v1.2.1