From 1e9557070a067c56a44623be5ea0d4caa4ee023e Mon Sep 17 00:00:00 2001 From: Darcy Shen Date: Sun, 3 Dec 2023 02:17:09 +0800 Subject: [PATCH] [71_11] Use macOS instead Mac OS --- .gitignore | 2 +- TeXmacs/langs/natural/dic/english-ignore.scm | 2 +- TeXmacs/progs/generic/generic-kbd.scm | 4 ++-- TeXmacs/progs/security/keychain/macos-security.scm | 4 ++-- TeXmacs/progs/security/keychain/win-security.scm | 2 +- TeXmacs/progs/texmacs/keyboard/prefix-kbd.scm | 2 +- TeXmacs/progs/texmacs/menus/preferences-menu.scm | 2 +- TeXmacs/progs/texmacs/menus/preferences-widgets.scm | 4 ++-- src/Plugins/Qt/qt_utilities.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 83c7a1ecdd..53f2131d0a 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ __pycache__/ .idea .vscode -# Mac OS +# macOS .DS_Store */.DS_Store diff --git a/TeXmacs/langs/natural/dic/english-ignore.scm b/TeXmacs/langs/natural/dic/english-ignore.scm index c42850508e..5c14fcc22e 100644 --- a/TeXmacs/langs/natural/dic/english-ignore.scm +++ b/TeXmacs/langs/natural/dic/english-ignore.scm @@ -139,7 +139,7 @@ ("luxi" "") ("mS Gothic" "") ("mS Mincho" "") -("mac OS" "") +("macOS" "") ("make-section error" "") ("marker Felt" "") ("mathemagix" "") diff --git a/TeXmacs/progs/generic/generic-kbd.scm b/TeXmacs/progs/generic/generic-kbd.scm index 8792e52fc8..c714383c8e 100644 --- a/TeXmacs/progs/generic/generic-kbd.scm +++ b/TeXmacs/progs/generic/generic-kbd.scm @@ -573,13 +573,13 @@ ("M-S-space" (make-space "-0.2spc"))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Mac OS keymap +;; macOS keymap ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (kbd-map (:profile macos) - ;; standard Mac OS keyboard shortcuts + ;; standard macOS keyboard shortcuts ("macos ;" (interactive-spell)) ("macos ?" (interactive docgrep-in-doc)) ("macos ," (interactive open-preferences)) diff --git a/TeXmacs/progs/security/keychain/macos-security.scm b/TeXmacs/progs/security/keychain/macos-security.scm index 3d10a540f1..acf1d41a65 100644 --- a/TeXmacs/progs/security/keychain/macos-security.scm +++ b/TeXmacs/progs/security/keychain/macos-security.scm @@ -2,7 +2,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; MODULE : macos-security.scm -;; DESCRIPTION : Interface to Mac OS 'security' command +;; DESCRIPTION : Interface to macOS 'security' command ;; COPYRIGHT : (C) 2015 Gregoire Lecerf ;; ;; This software falls under the GNU general public license version 3 or later. @@ -18,7 +18,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (tm-define (system-security-error cmd out err) - (report-system-error "Mac OS security command failed" cmd out err)) + (report-system-error "macOS security command failed" cmd out err)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Add generic password diff --git a/TeXmacs/progs/security/keychain/win-security.scm b/TeXmacs/progs/security/keychain/win-security.scm index 5157836703..bc5f8ac414 100644 --- a/TeXmacs/progs/security/keychain/win-security.scm +++ b/TeXmacs/progs/security/keychain/win-security.scm @@ -2,7 +2,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; MODULE : win-security.scm -;; DESCRIPTION : Interface to Mac OS security software +;; DESCRIPTION : Interface to macOS security software ;; COPYRIGHT : (C) 2015 Gregoire Lecerf, Denis Raux ;; ;; This software falls under the GNU general public license version 3 or later. diff --git a/TeXmacs/progs/texmacs/keyboard/prefix-kbd.scm b/TeXmacs/progs/texmacs/keyboard/prefix-kbd.scm index 3cb4e8682a..b320eb589f 100644 --- a/TeXmacs/progs/texmacs/keyboard/prefix-kbd.scm +++ b/TeXmacs/progs/texmacs/keyboard/prefix-kbd.scm @@ -177,7 +177,7 @@ ) ;; end when (like-kde?) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Mac OS prefixes +;; macOS prefixes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (when (like-macos?) diff --git a/TeXmacs/progs/texmacs/menus/preferences-menu.scm b/TeXmacs/progs/texmacs/menus/preferences-menu.scm index adfd00bb3f..401ce75479 100644 --- a/TeXmacs/progs/texmacs/menus/preferences-menu.scm +++ b/TeXmacs/progs/texmacs/menus/preferences-menu.scm @@ -58,7 +58,7 @@ ("Emacs" "emacs") ("Gnome" "gnome") ("KDE" "kde") - ("Mac OS" "macos") + ("macOS" "macos") ("Windows" "windows")) ; (enum ("Profile" "profile") ; ("Beginner" "beginner") diff --git a/TeXmacs/progs/texmacs/menus/preferences-widgets.scm b/TeXmacs/progs/texmacs/menus/preferences-widgets.scm index 5083b4fd91..029e6e6b99 100644 --- a/TeXmacs/progs/texmacs/menus/preferences-widgets.scm +++ b/TeXmacs/progs/texmacs/menus/preferences-widgets.scm @@ -35,7 +35,7 @@ ("emacs" "Emacs") ("gnome" "Gnome") ("kde" "KDE") - ("macos" "Mac OS") + ("macos" "macOS") ("windows" "Windows")) (for (l supported-languages) @@ -68,7 +68,7 @@ (aligned (item (text "Look and feel:") (enum (set-pretty-preference* "look and feel" answer) - '("Default" "Emacs" "Gnome" "KDE" "Mac OS" "Windows") + '("Default" "Emacs" "Gnome" "KDE" "macOS" "Windows") (get-pretty-preference "look and feel") "18em")) (item (text "User interface language:") diff --git a/src/Plugins/Qt/qt_utilities.cpp b/src/Plugins/Qt/qt_utilities.cpp index 93d77c39aa..be42eab8e4 100644 --- a/src/Plugins/Qt/qt_utilities.cpp +++ b/src/Plugins/Qt/qt_utilities.cpp @@ -299,7 +299,7 @@ to_qstringlist (array l) { it's cork, but often it's utf8. For instance when the title is built in a tmfs title handler in scheme, it is sent to us as an utf8 string. Should we convert before? Another example are items in the go-menu: file names are internally - stored using the os 8-bit encoding (UTF-8 on linux/Mac OS locale code page on + stored using the os 8-bit encoding (UTF-8 on linux/macOS locale code page on windows), but we assume that strings are sent to us for display in widgets as cork and thus display the wrong encoding.