diff options
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ange-ftp.el | 2 | ||||
| -rw-r--r-- | lisp/net/browse-url.el | 6 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 6 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 9ff9997e728..07c3daf7d7e 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -740,7 +740,7 @@ These mean that the FTP process should be (or already has been) killed." :type 'regexp) (defcustom ange-ftp-potential-error-msgs - ;; On Mac OS X we sometimes get things like: + ;; On macOS we sometimes get things like: ;; ;; ftp> open ftp.nluug.nl ;; Trying 2001:610:1:80aa:192:87:102:36... diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 15f6df742cc..b2077d784c0 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -44,7 +44,7 @@ ;; browse-url-text-* Any text browser 0 ;; browse-url-generic arbitrary ;; browse-url-default-windows-browser MS-Windows browser -;; browse-url-default-macosx-browser Mac OS X browser +;; browse-url-default-macosx-browser macOS browser ;; browse-url-xdg-open Free Desktop xdg-open on Gnome, KDE, Xfce4, LXDE ;; browse-url-kde KDE konqueror (kfm) ;; browse-url-elinks Elinks Don't know (tried with 0.12.GIT) @@ -162,7 +162,7 @@ regexp should probably be \".\" to specify a default browser." :value browse-url-generic) (function-item :tag "Default Windows browser" :value browse-url-default-windows-browser) - (function-item :tag "Default Mac OS X browser" + (function-item :tag "Default macOS browser" :value browse-url-default-macosx-browser) (function-item :tag "Default browser" :value browse-url-default-browser) @@ -881,7 +881,7 @@ The optional NEW-WINDOW argument is not used." (t (w32-shell-execute "open" url)))) (defun browse-url-default-macosx-browser (url &optional _new-window) - "Invoke the MacOS X system's default Web browser. + "Invoke the macOS system's default Web browser. The optional NEW-WINDOW argument is not used" (interactive (browse-url-interactive-arg "URL: ")) (start-process (concat "open " url) nil "open" url)) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 9496ebf7563..f44a4d37e78 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -1293,7 +1293,7 @@ target of the symlink differ." res-uid res-gid res-size res-symlink-target) (tramp-message vec 5 "file attributes with ls: %s" localname) ;; We cannot send all three commands combined, it could exceed - ;; NAME_MAX or PATH_MAX. Happened on Mac OS X, for example. + ;; NAME_MAX or PATH_MAX. Happened on macOS, for example. (when (or (tramp-send-command-and-check vec (format "%s %s" @@ -4123,7 +4123,7 @@ process to set up. VEC specifies the connection." (goto-char (point-min)) (when (search-forward "\r" nil t) (setq cs-decode (coding-system-change-eol-conversion cs-decode 'dos))) - ;; Special setting for Mac OS X. + ;; Special setting for macOS. (when (and (string-match "^Darwin" uname) (memq 'utf-8-hfs (coding-system-list))) (setq cs-decode 'utf-8-hfs @@ -4178,7 +4178,7 @@ process to set up. VEC specifies the connection." (tramp-send-command vec "stty tabs" t) (tramp-send-command vec "stty tab0" t)) - ;; Set utf8 encoding. Needed for Mac OS X, for example. This is + ;; Set utf8 encoding. Needed for macOS, for example. This is ;; non-POSIX, so we must expect errors on some systems. (tramp-send-command vec "stty iutf8 2>/dev/null" t) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index e9697ff2e1e..60199d2047e 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -981,7 +981,7 @@ this variable to be set as well." :require 'tramp) ;; Logging in to a remote host normally requires obtaining a pty. But -;; Emacs on MacOS X has process-connection-type set to nil by default, +;; Emacs on macOS has process-connection-type set to nil by default, ;; so on those systems Tramp doesn't obtain a pty. Here, we allow ;; for an override of the system default. (defcustom tramp-process-connection-type t |