diff options
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/ns-win.el | 14 | ||||
| -rw-r--r-- | lisp/term/xterm.el | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 5080ed0a8f7..41d6d72812b 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -1,4 +1,4 @@ -;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/MacOS X window system -*- lexical-binding: t -*- +;;; ns-win.el --- lisp side of interface with NeXT/Open/GNUstep/macOS window system -*- lexical-binding: t -*- ;; Copyright (C) 1993-1994, 2005-2016 Free Software Foundation, Inc. @@ -41,7 +41,7 @@ ;;; Code: (eval-when-compile (require 'cl-lib)) (or (featurep 'ns) - (error "%s: Loading ns-win.el but not compiled for GNUstep/MacOS" + (error "%s: Loading ns-win.el but not compiled for GNUstep/macOS" (invocation-name))) ;; Documentation-purposes only: actually loaded in loadup.el. @@ -54,7 +54,7 @@ (require 'ucs-normalize) (defgroup ns nil - "GNUstep/Mac OS X specific features." + "GNUstep/macOS specific features." :group 'environment) ;;;; Command line argument handling. @@ -338,7 +338,7 @@ See `ns-insert-working-text'." (setq ns-working-overlay nil)) -;; OS X file system Unicode UTF-8 NFD (decomposed form) support. +;; macOS file system Unicode UTF-8 NFD (decomposed form) support. (when (eq system-type 'darwin) ;; Used prior to Emacs 25. (define-coding-system-alias 'utf-8-nfd 'utf-8-hfs) @@ -641,7 +641,7 @@ This function has been overloaded in Nextstep.") (set-frame-font ns-input-font)) -;; Default fontset for Mac OS X. This is mainly here to show how a fontset +;; Default fontset for macOS. This is mainly here to show how a fontset ;; can be set up manually. Ordinarily, fontsets are auto-created whenever ;; a font is chosen by (defvar ns-standard-fontset-spec @@ -655,7 +655,7 @@ This function has been overloaded in Nextstep.") ",") "String of fontset spec of the standard fontset. This defines a fontset consisting of the Courier and other fonts that -come with OS X. +come with macOS. See the documentation of `create-fontset-from-fontset-spec' for the format.") (defvar ns-reg-to-script) ; nsfont.m @@ -844,7 +844,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.") (setq default-process-coding-system '(utf-8-unix . utf-8-unix))))) - ;; OS X Lion introduces PressAndHold, which is unsupported by this port. + ;; Mac OS X Lion introduces PressAndHold, which is unsupported by this port. ;; See this thread for more details: ;; http://lists.gnu.org/archive/html/emacs-devel/2011-06/msg00505.html (ns-set-resource nil "ApplePressAndHoldEnabled" "NO") diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el index 01c01130e7c..5fc6056ca23 100644 --- a/lisp/term/xterm.el +++ b/lisp/term/xterm.el @@ -784,7 +784,7 @@ We run the first FUNCTION whose STRING matches the input events." ;; Try to find out the type of terminal by sending a "Secondary ;; Device Attributes (DA)" query. (xterm--query "\e[>0c" - ;; Some terminals (like OS X's Terminal.app) respond to + ;; Some terminals (like macOS's Terminal.app) respond to ;; this query as if it were a "Primary Device Attributes" ;; query instead, so we should handle that too. '(("\e[?" . xterm--version-handler) |