From 9e9da4471af73dc93f00536e1ffe6d2c322c1187 Mon Sep 17 00:00:00 2001 From: Tom Willemse Date: Wed, 1 Dec 2021 18:19:06 -0800 Subject: [PATCH] [oni-gui] Disable ligatures on Windows I'm trying to fix an issue with loading a C# file that freezes my Emacs on Windows. I've turned off the other functions, but it appears that this still happens. If I have ligatures off, it seems to work ok. --- oni-gui.el | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/oni-gui.el b/oni-gui.el index 8938dc5..3801975 100644 --- a/oni-gui.el +++ b/oni-gui.el @@ -4,7 +4,7 @@ ;; Author: Tom Willemse ;; Keywords: local -;; Version: 2021.1201.174449 +;; Version: 2021.1201.181902 ;; Package-Requires: (oni-ui oni-hydra yoshi-theme diminish) ;; This program is free software; you can redistribute it and/or modify @@ -113,16 +113,15 @@ _bi_: Auto Insert ^^ ^^ (scroll-bar-mode -1) -(if (daemonp) - (progn - (add-hook 'after-make-frame-functions #'oni-gui-setup-ligatures) - (unless (eq system-type 'windows-nt) +(unless (eq system-type 'windows-nt) + (if (daemonp) + (progn + (add-hook 'after-make-frame-functions #'oni-gui-setup-ligatures) (add-hook 'after-make-frame-functions #'oni-gui-setup-fontsets) - (add-hook 'after-make-frame-functions #'oni-gui-setup-faces))) - (unless (eq system-type 'windows-nt) + (add-hook 'after-make-frame-functions #'oni-gui-setup-faces)) (oni-gui-setup-fontsets nil) - (oni-gui-setup-faces nil)) - (oni-gui-setup-ligatures)) + (oni-gui-setup-faces nil) + (oni-gui-setup-ligatures))) (global-unset-key (kbd "C-z")) (global-set-key (kbd "C-c c") 'oni-gui-hydra/body)