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

core-ui: minor reformatting/refactor

Browse source
This commit is contained in:
Henrik Lissner 2018-09-18 11:50:28 -04:00
parent 4067c8937e
commit e71b26b1e8
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
core/core-ui.el
View file

@ -134,6 +134,10 @@ Expects a `font-spec'.")
;; ;;
;; Built-in packages ;; Built-in packages
;; Handle ansi codes in compilation buffer
(add-hook 'compilation-filter-hook #'doom|apply-ansi-color-to-compilation-buffer)
;; show typed keystrokes in minibuffer ;; show typed keystrokes in minibuffer
(defun doom|enable-ui-keystrokes () (setq echo-keystrokes 0.02)) (defun doom|enable-ui-keystrokes () (setq echo-keystrokes 0.02))
(defun doom|disable-ui-keystrokes () (setq echo-keystrokes 0)) (defun doom|disable-ui-keystrokes () (setq echo-keystrokes 0))
@ -244,11 +248,11 @@ Expects a `font-spec'.")
;; line numbers in most modes ;; line numbers in most modes
(add-hook! (prog-mode text-mode conf-mode) #'display-line-numbers-mode) (add-hook! (prog-mode text-mode conf-mode) #'display-line-numbers-mode)
;; Emacs 26+ has native line number support, and will ignore nlinum. This is for
;; Emacs 25 users:
(defun doom|enable-line-numbers () (display-line-numbers-mode +1)) (defun doom|enable-line-numbers () (display-line-numbers-mode +1))
(defun doom|disable-line-numbers () (display-line-numbers-mode -1)) (defun doom|disable-line-numbers () (display-line-numbers-mode -1))
;; Emacs 26+ has native line number support, and will ignore nlinum. This is for
;; Emacs 25 users:
(def-package! nlinum (def-package! nlinum
;; Line number column. A faster (or equivalent, in the worst case) line number ;; Line number column. A faster (or equivalent, in the worst case) line number
;; plugin than `linum-mode'. ;; plugin than `linum-mode'.
@ -349,9 +353,7 @@ frame's window-system, the theme will be reloaded.")
(lwarn 'doom-ui :warning (lwarn 'doom-ui :warning
"Could not find the '%s' font on your system, falling back to system font" "Could not find the '%s' font on your system, falling back to system font"
(font-get (caddr e) :family)) (font-get (caddr e) :family))
(lwarn 'doom-ui :error (signal 'doom-error e)))))
"Unexpected error while initializing fonts: %s"
(error-message-string e))))))
(defun doom|init-theme () (defun doom|init-theme ()
"Set the theme and load the font, in that order." "Set the theme and load the font, in that order."
@ -395,7 +397,7 @@ frame's window-system, the theme will be reloaded.")
;; simple name in frame title ;; simple name in frame title
(setq frame-title-format '("%b – Doom Emacs")) (setq frame-title-format '("%b – Doom Emacs"))
;; relegate tooltips to echo area only ;; relegate tooltips to echo area only
(tooltip-mode -1) (if (boundp 'tooltip-mode) (tooltip-mode -1))
;; a good indicator that Emacs isn't frozen ;; a good indicator that Emacs isn't frozen
(add-hook 'doom-init-ui-hook #'blink-cursor-mode) (add-hook 'doom-init-ui-hook #'blink-cursor-mode)
;; Make `next-buffer', `other-buffer', etc. ignore unreal buffers. ;; Make `next-buffer', `other-buffer', etc. ignore unreal buffers.
@ -428,7 +430,6 @@ instead). Meant for `kill-buffer-query-functions'."
(add-to-list 'kill-buffer-query-functions #'doom|protect-fallback-buffer nil #'eq) (add-to-list 'kill-buffer-query-functions #'doom|protect-fallback-buffer nil #'eq)
(add-to-list 'kill-buffer-query-functions #'doom|protect-visible-buffer nil #'eq) (add-to-list 'kill-buffer-query-functions #'doom|protect-visible-buffer nil #'eq)
(add-hook 'after-change-major-mode-hook #'doom|highlight-non-default-indentation) (add-hook 'after-change-major-mode-hook #'doom|highlight-non-default-indentation)
(add-hook 'compilation-filter-hook #'doom|apply-ansi-color-to-compilation-buffer)
(run-hook-wrapped 'doom-init-ui-hook #'doom-try-run-hook)) (run-hook-wrapped 'doom-init-ui-hook #'doom-try-run-hook))
(add-hook 'emacs-startup-hook #'doom|init-ui) (add-hook 'emacs-startup-hook #'doom|init-ui)