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

Lint code

Browse source
This commit is contained in:
Gerry Agbobada 2020-04-25 17:54:51 +02:00 • committed by Gerry Agbobada
parent 9a79069ab5
commit 8a2f8bf260
No known key found for this signature in database
GPG key ID: BE26DBAFD866BE34
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/ui/pretty-code/config.el
View file

@ -98,6 +98,7 @@ Otherwise it builds `prettify-code-symbols-alist' according to
(add-hook 'after-change-major-mode-hook #'+pretty-code-init-pretty-symbols-h) (add-hook 'after-change-major-mode-hook #'+pretty-code-init-pretty-symbols-h)
;;; Automatic font-specific ligatures
(defvar +prog-ligatures-alist (defvar +prog-ligatures-alist
'((?! . "!\\(?:\\(==\\|[!=]\\)[!=]?\\)") '((?! . "!\\(?:\\(==\\|[!=]\\)[!=]?\\)")
(?# . "#\\(?:\\(###?\\|_(\\|[(:=?[_{]\\)[#(:=?[_{]?\\)") (?# . "#\\(?:\\(###?\\|_(\\|[(:=?[_{]\\)[#(:=?[_{]?\\)")
@ -134,20 +135,19 @@ The car is the character ASCII number, cdr is a regex which will call `font-shap
when matched. when matched.
Because of the underlying code in :ui pretty-code module, the regex should match a string Because of the underlying code in :ui pretty-code module, the regex should match a string
starting with the character contained in car." starting with the character contained in car.
)
This variable is used only if you built Emacs with Harfbuzz on a version >= 28")
;; Defaults to not org-mode because org-bullets might be incompatible
;; with the ?*-based replacements in the default value of +prg-ligatures-alist
(defvar +prog-ligatures-modes '(not org-mode) (defvar +prog-ligatures-modes '(not org-mode)
"List of major modes in which ligatures should be enabled. "List of major modes in which ligatures should be enabled.
If t, enable it everywhere. If t, enable it everywhere. Fundamental mode, and modes derived from special-mode,
comint-mode, eshell-mode and term-mode are *still* excluded.
If the first element is 'not, enable it in any mode besides what is listed. If the first element is 'not, enable it in any mode besides what is listed.
If nil, fallback to the prettify-symbols based replacement (add +font features to pretty-code)." If nil, fallback to the prettify-symbols based replacement (add +font features to pretty-code).")
)
(defun +pretty-code-init-ligatures-h () (defun +pretty-code-init-ligatures-h ()
"Enable ligatures. "Enable ligatures.
@ -184,7 +184,7 @@ Otherwise it sets the buffer-local composition table to a composition table enha
(cond ((and IS-MAC (fboundp 'mac-auto-operator-composition-mode)) (cond ((and IS-MAC (fboundp 'mac-auto-operator-composition-mode))
(mac-auto-operator-composition-mode)) (mac-auto-operator-composition-mode))
;; Harfbuzz builds do not need font-specific ligature support ;; Harfbuzz builds do not need font-specific ligature support
;; if they brought in the fe903c5 commit ;; if they are above emacs-27
((and (version<= "28.0" emacs-version) ((and (version<= "28.0" emacs-version)
(string-match-p "HARFBUZZ" system-configuration-features) (string-match-p "HARFBUZZ" system-configuration-features)
(not (null +prog-ligatures-modes))) (not (null +prog-ligatures-modes)))