emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor!: deprecate IS-* OS constants

Browse source 
BREAKING CHANGE: This deprecates the IS-(MAC|WINDOWS|LINUX|BSD) family
of global constants in favor of a native `featurep` check:

  IS-MAC      ->  (featurep :system 'macos)
  IS-WINDOWS  ->  (featurep :system 'windows)
  IS-LINUX    ->  (featurep :system 'linux)
  IS-BSD      ->  (featurep :system 'bsd)

The constants will stick around until the v3 release so folks can still
use it -- and there are still some modules that use it, but I'll phase
those uses out gradually.

Fix: #7479
This commit is contained in:
Henrik Lissner 2023-12-05 17:05:13 -05:00
parent d38787edf4
commit 659f7bfc71
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
52 changed files with 150 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/ui/ligatures/config.el
View file

@ -157,7 +157,8 @@ and cannot run in."
;; using the same composition-function-table method
;; https://bitbucket.org/mituharu/emacs-mac/src/26c8fd9920db9d34ae8f78bceaec714230824dac/lisp/term/mac-win.el?at=master#lines-345:805
;; so use that instead if this module is enabled.
((and IS-MAC (fboundp 'mac-auto-operator-composition-mode))
((if (featurep :system 'macos)
(fboundp 'mac-auto-operator-composition-mode))
(add-hook 'doom-init-ui-hook #'mac-auto-operator-composition-mode 'append))
;; NOTE: the module does not support Emacs 27 and less, but if we still try to enable ligatures,

8
modules/ui/ligatures/doctor.el
View file

@ -1,7 +1,8 @@
;; This cond expression mimics the activation conditional of ligatures,
;; with a fallback that triggers a warning.
(cond
((and IS-MAC (fboundp 'mac-auto-operator-composition-mode))
((if (featurep :system 'macos)
(fboundp 'mac-auto-operator-composition-mode))
(ignore))
((and (> emacs-major-version 27)
@ -10,7 +11,6 @@
(featurep 'composite)) ; Emacs loads `composite' at startup
(ignore))
(t
(if IS-MAC
(warn! "The (:ui ligatures) module does not support your version of Emacs. Install emacs-plus with at least Emacs 28, or emacs-mac.")
((if (featurep :system 'macos)
(warn! "The (:ui ligatures) module does not support your version of Emacs. Install emacs-plus with at least Emacs 28, or emacs-mac.")
(warn! "The (:ui ligatures) module does not support your version of Emacs. Make sure to have at least Emacs 28 with Harfbuzz configured (should be the default)."))))

2
modules/ui/modeline/+light.el
View file

@ -489,7 +489,7 @@ lines are selected, or the NxM dimensions of a block selection.")
`(:eval
(let ((sys (coding-system-plist buffer-file-coding-system))
(eol (coding-system-eol-type-mnemonic buffer-file-coding-system)))
(concat (unless (equal eol ,(if IS-WINDOWS "CRLF" "LF"))
(concat (unless (equal eol ,(if (featurep :system 'windows) "CRLF" "LF"))
(concat " " eol " "))
(if (memq (plist-get sys :category)
'(coding-category-undecided coding-category-utf-8))

4
modules/ui/modeline/config.el
View file

@ -24,9 +24,7 @@
;; than the current OSes preference
doom-modeline-buffer-encoding 'nondefault
doom-modeline-default-eol-type
(cond (IS-MAC 2)
(IS-WINDOWS 1)
(0)))
(pcase doom-system ('macos 2) ('windows 1) (_ 0)))
:config
;; Fix an issue where these two variables aren't defined in TTY Emacs on MacOS