Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[71_11] Use macOS instead Mac OS #1402

Merged
merged 1 commit into from
Dec 2, 2023
+12 −12
Merged

[71_11] Use macOS instead Mac OS #1402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ __pycache__/
.idea
.vscode

# Mac OS
# macOS
.DS_Store
*/.DS_Store

Expand Down
2 changes: 1 addition & 1 deletion TeXmacs/langs/natural/dic/english-ignore.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@
("luxi" "")
("mS Gothic" "")
("mS Mincho" "")
("mac OS" "")
("macOS" "")
("make-section error" "")
("marker Felt" "")
("mathemagix" "")
Expand Down
4 changes: 2 additions & 2 deletions TeXmacs/progs/generic/generic-kbd.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions TeXmacs/progs/security/keychain/macos-security.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion TeXmacs/progs/security/keychain/win-security.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion TeXmacs/progs/texmacs/keyboard/prefix-kbd.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
) ;; end when (like-kde?)

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Mac OS prefixes
;; macOS prefixes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

(when (like-macos?)
Expand Down
2 changes: 1 addition & 1 deletion TeXmacs/progs/texmacs/menus/preferences-menu.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
("Emacs" "emacs")
("Gnome" "gnome")
("KDE" "kde")
("Mac OS" "macos")
("macOS" "macos")
("Windows" "windows"))
; (enum ("Profile" "profile")
; ("Beginner" "beginner")
Expand Down
4 changes: 2 additions & 2 deletions TeXmacs/progs/texmacs/menus/preferences-widgets.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
("emacs" "Emacs")
("gnome" "Gnome")
("kde" "KDE")
("macos" "Mac OS")
("macos" "macOS")
("windows" "Windows"))

(for (l supported-languages)
Expand Down Expand Up @@ -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:")
Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/Qt/qt_utilities.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ to_qstringlist (array<string> 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.

Expand Down