diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-06-05 18:06:18 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-06-05 18:06:18 +0200 |
| commit | 478ca66a8c9abb72e08cc069f2fb57314e01dfd9 (patch) | |
| tree | d4507ae3596800ae6ec0dfbbab8c9ffc040ae612 /lisp/init-mac.el | |
| parent | 239a50b5e905d5fbcd1bec79cf4c92caad16e8d9 (diff) | |
Remove ligatures
Diffstat (limited to 'lisp/init-mac.el')
| -rw-r--r-- | lisp/init-mac.el | 51 |
1 files changed, 6 insertions, 45 deletions
diff --git a/lisp/init-mac.el b/lisp/init-mac.el index 6f6df8f..d51e763 100644 --- a/lisp/init-mac.el +++ b/lisp/init-mac.el @@ -5,51 +5,12 @@ (set-face-attribute 'default nil :family (concat font-family " Retina")) (set-face-attribute 'default nil :height 140) - ;; configure ligatures - ;; https://github.com/tonsky/FiraCode/wiki/Emacs-instructions - (let ((alist '((33 . ".\\(?:\\(?:==\\|!!\\)\\|[!=]\\)") - (35 . ".\\(?:###\\|##\\|_(\\|[#(?[_{]\\)") - (36 . ".\\(?:>\\)") - (37 . ".\\(?:\\(?:%%\\)\\|%\\)") - (38 . ".\\(?:\\(?:&&\\)\\|&\\)") - (42 . ".\\(?:\\(?:\\*\\*/\\)\\|\\(?:\\*[*/]\\)\\|[*/>]\\)") - (43 . ".\\(?:\\(?:\\+\\+\\)\\|[+>]\\)") - (45 . ".\\(?:\\(?:-[>-]\\|<<\\|>>\\)\\|[<>}~-]\\)") - (46 . ".\\(?:\\(?:\\.[.<]\\)\\|[.=-]\\)") - (47 . ".\\(?:\\(?:\\*\\*\\|//\\|==\\)\\|[*/=>]\\)") - (48 . ".\\(?:x[a-zA-Z]\\)") - (58 . ".\\(?:::\\|[:=]\\)") - (59 . ".\\(?:;;\\|;\\)") - (60 . ".\\(?:\\(?:!--\\)\\|\\(?:~~\\|->\\|\\$>\\|\\*>\\|\\+>\\|--\\|<[<=-]\\|=[<=>]\\||>\\)\\|[*$+~/<=>|-]\\)") - (61 . ".\\(?:\\(?:/=\\|:=\\|<<\\|=[=>]\\|>>\\)\\|[<=>~]\\)") - (62 . ".\\(?:\\(?:=>\\|>[=>-]\\)\\|[=>-]\\)") - (63 . ".\\(?:\\(\\?\\?\\)\\|[:=?]\\)") - (91 . ".\\(?:]\\)") - (92 . ".\\(?:\\(?:\\\\\\\\\\)\\|\\\\\\)") - (94 . ".\\(?:=\\)") - (119 . ".\\(?:ww\\)") - (123 . ".\\(?:-\\)") - (124 . ".\\(?:\\(?:|[=|]\\)\\|[=>|]\\)") - (126 . ".\\(?:~>\\|~~\\|[>=@~-]\\)") - ) - )) - (dolist (char-regexp alist) - (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 - ;; - ;; increment split-height-threshold so that vertical splits are still - ;; preferred in most cases - (setq split-height-threshold (+ 10 split-height-threshold))) + ;; fira code retina at 14 pt may result in (window-total-height) being + ;; exactly 80 which makes sensible splitting less sensible + ;; + ;; increment split-height-threshold so that vertical splits are still + ;; preferred in most cases + (setq split-height-threshold (+ 10 split-height-threshold)))) ;; configure modifiers (setq mac-option-modifier 'super) |