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

Minor refactors & reformatting

Browse source
This commit is contained in:
Henrik Lissner 2020-01-20 01:54:11 -05:00
parent bf85a03f5e
commit dc2b9781ab
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
4 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
core/core-ui.el
View file

@ -544,22 +544,23 @@ behavior). Do not set this directly, this is let-bound in `doom-init-theme-h'.")
(defun doom-init-fonts-h () (defun doom-init-fonts-h ()
"Loads `doom-font'." "Loads `doom-font'."
(cond (doom-font (cond
(cl-pushnew (doom-font
;; Avoiding `set-frame-font' because it does a lot of extra, expensive (cl-pushnew
;; work we can avoid by setting the font frame parameter instead. ;; Avoiding `set-frame-font' because it does a lot of extra, expensive
(cons 'font ;; work we can avoid by setting the font frame parameter instead.
(cond ((stringp doom-font) doom-font) (cons 'font
((fontp doom-font) (font-xlfd-name doom-font)) (cond ((stringp doom-font) doom-font)
((signal 'wrong-type-argument (list '(fontp stringp) ((fontp doom-font) (font-xlfd-name doom-font))
doom-font))))) ((signal 'wrong-type-argument (list '(fontp stringp)
default-frame-alist doom-font)))))
:key #'car :test #'eq)) default-frame-alist
((display-graphic-p) :key #'car :test #'eq))
;; We try our best to record your system font, so `doom-big-font-mode' ((display-graphic-p)
;; can still use it to compute a larger font size with. ;; We try our best to record your system font, so `doom-big-font-mode'
(setq font-use-system-font t ;; can still use it to compute a larger font size with.
doom-font (face-attribute 'default :font))))) (setq font-use-system-font t
doom-font (face-attribute 'default :font)))))
(defun doom-init-extra-fonts-h (&optional frame) (defun doom-init-extra-fonts-h (&optional frame)
"Loads `doom-variable-pitch-font',`doom-serif-font' and `doom-unicode-font'." "Loads `doom-variable-pitch-font',`doom-serif-font' and `doom-unicode-font'."

3
core/core.el
View file

@ -456,8 +456,7 @@ unreadable. Returns the names of envvars that were changed."
exec-path) exec-path)
shell-file-name shell-file-name
(if (member "SHELL" envvars) (if (member "SHELL" envvars)
(setq shell-file-name (or (getenv "SHELL") shell-file-name)
(or (getenv "SHELL") shell-file-name))
shell-file-name)) shell-file-name))
envvars)))) envvars))))

3
modules/checkers/grammar/config.el
View file

@ -18,7 +18,8 @@
"/usr/share/java/languagetool/languagetool-commandline.jar"))))) "/usr/share/java/languagetool/languagetool-commandline.jar")))))
;; Detects weasel words, passive voice and duplicates ;; Detects weasel words, passive voice and duplicates. Proselint would be a
;; better choice.
(use-package! writegood-mode (use-package! writegood-mode
:hook (org-mode markdown-mode rst-mode asciidoc-mode latex-mode) :hook (org-mode markdown-mode rst-mode asciidoc-mode latex-mode)
:config :config

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

@ -8,7 +8,7 @@
neotree-find neotree-find
neo-global--with-buffer neo-global--with-buffer
neo-global--window-exists-p) neo-global--window-exists-p)
:config :init
(setq neo-create-file-auto-open nil (setq neo-create-file-auto-open nil
neo-auto-indent-point nil neo-auto-indent-point nil
neo-autorefresh nil neo-autorefresh nil
@ -35,6 +35,7 @@
"~$" "~$"
"^#.*#$")) "^#.*#$"))
:config
(set-popup-rule! "^ ?\\*NeoTree" :ignore t) (set-popup-rule! "^ ?\\*NeoTree" :ignore t)
(after! winner (after! winner