diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-06 00:33:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-06 00:42:03 -0700 |
| commit | dc152c54f4e44f5f2040883b03f71ff6aa66c893 (patch) | |
| tree | 7b4f0336a1f03e7a53d980000a42568b10907409 /lisp/vc/pcvs.el | |
| parent | 84c53436ab25b6c8f76c133e59b34e533ea33cc7 (diff) | |
| download | emacs-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/vc/pcvs.el')
| -rw-r--r-- | lisp/vc/pcvs.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 573feedd047..b0ad5ea588d 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -551,7 +551,7 @@ If non-nil, NEW means to create a new buffer no matter what." ;; is accessed via SSH, a bad interaction between libc, ;; CVS and SSH can lead to garbled output. ;; It might be a glibc-specific problem (but it can also happens - ;; under Mac OS X, it seems). + ;; under macOS, it seems). ;; It seems that using a pty can help circumvent the problem, ;; but at the cost of screwing up when the process thinks it ;; can ask for user input (such as password or host-key @@ -696,7 +696,7 @@ SUBDIR is the subdirectory (if any) where this command was run. OLD-FIS is the list of fileinfos on which the cvs command was applied and which should be considered up-to-date if they are missing from the output." (when (eq system-type 'darwin) - ;; Fixup the ^D^H^H inserted at beginning of buffer sometimes on MacOSX + ;; Fixup the ^D^H^H inserted at beginning of buffer sometimes on macOS ;; because of the call to `process-send-eof'. (save-excursion (goto-char (point-min)) |