diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-05-30 13:57:58 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-05-30 13:57:58 +0200 |
commit | 958cd5c066d2a10e3b195bf1c34f2dfe618332a0 (patch) | |
tree | a2d71947ff169c6adfe589507d6712ce18127531 /lisp | |
parent | e0368eeb0232579f9e34576841272fee249ae04b (diff) |
Only enable auto-composition-mode in prog-mode
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/init-email.el | 5 | ||||
-rw-r--r-- | lisp/init-mac.el | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lisp/init-email.el b/lisp/init-email.el index 83086f4..7332d44 100644 --- a/lisp/init-email.el +++ b/lisp/init-email.el @@ -51,11 +51,6 @@ user-mail-address (string-trim (shell-command-to-string "git config --global --get user.email")))) - ;; disable auto-composition-mode in mu4e-headers-mode due to ligatures - ;; triggering a performance issue - (add-hook 'mu4e-headers-mode-hook - (lambda () (setq-local auto-composition-mode nil))) - ;; delete moves email to trash :bind (:map mu4e-headers-mode-map ("d" . "mt") :map mu4e-view-mode-map ("d" . "mt"))) diff --git a/lisp/init-mac.el b/lisp/init-mac.el index f794048..6f6df8f 100644 --- a/lisp/init-mac.el +++ b/lisp/init-mac.el @@ -37,6 +37,13 @@ (set-char-table-range composition-function-table (car char-regexp) `([,(cdr char-regexp) 0 font-shape-gstring]))))) + ;; ligatures may be expensive so only enable them in prog-mode + (use-package composite + :ensure nil ;; package is bundled with emacs + :config + (global-auto-composition-mode -1) + (add-hook 'prog-mode-hook 'auto-composition-mode)) + ;; fira code retina at 14 pt may result in (window-total-height) being exactly ;; 80 which makes sensible splitting less sensible ;; |