From 8c4bee69d8d71f41b6727334926aa36006e97b83 Mon Sep 17 00:00:00 2001 From: tastytea Date: Fri, 12 Apr 2019 03:03:37 +0200 Subject: [PATCH] Reformatted init.el --- init.el | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/init.el b/init.el index d4794eb..f027174 100644 --- a/init.el +++ b/init.el @@ -1,5 +1,5 @@ ;;; init.el --- tastytea's Emacs init file. -;; Time-stamp: <2019-04-11T23:15:18+00:00> +;; Time-stamp: <2019-04-12T01:03:30+00:00> ;;; Commentary: ;; I am using this file with Emacs 26, but most of it will probably work with @@ -300,10 +300,9 @@ With argument, do this that many times." (use-package highlight-doxygen :custom-face - (highlight-doxygen-comment - ((t (:inherit font-lock-comment-face :foreground "#667788")))) - (highlight-doxygen-code-block - ((t (:inherit highlight-doxygen-comment-face)))) + (highlight-doxygen-comment ((t (:inherit font-lock-comment-face + :foreground "#667788")))) + (highlight-doxygen-code-block ((t (:inherit highlight-doxygen-comment-face)))) :hook (prog-mode . highlight-doxygen-mode)) @@ -400,7 +399,8 @@ With argument, do this that many times." :custom (doom-neotree-file-icons 'icons) :custom-face - (font-lock-comment-face ((t (:inherit font-lock-comment-face :foreground "#667755")))) + (font-lock-comment-face ((t (:inherit font-lock-comment-face + :foreground "#667755")))) :config (load-theme 'doom-molokai t) (doom-themes-neotree-config))) @@ -433,7 +433,7 @@ With argument, do this that many times." :defer t :custom-face (Man-overstrike ((t (:inherit font-lock-type-face :bold t)))) - (Man-underline ((t (:inherit font-lock-keyword-face :underline t))))) + (Man-underline ((t (:inherit font-lock-keyword-face :underline t))))) ;;;;;;;;;;;;;;;;;;;; Misc ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Show directory tree in a window. @@ -449,11 +449,9 @@ With argument, do this that many times." ("" . neotree-toggle)) ;; Git integration. -(use-package git-commit - :pin melpa-stable) +(use-package git-commit) (unless slow-computer (use-package magit - :pin melpa-stable :config (defun my/magit-kill-buffers (arg) "Restore window configuration and kill all Magit buffers." @@ -594,7 +592,7 @@ With argument, do this that many times." :config (delete 'newline-mark whitespace-style) ; Don't paint $ at eol. (delete 'lines whitespace-style) ; Don't paint lines red if too long. - ;; Don't show dots in popup menus. + ;; Workaround to not show dots in popup menus. (defun my/whitespace-mode-enabled-p () (symbol-value 'whitespace-mode)) (defvar-local my/ws-enabled nil) @@ -774,7 +772,7 @@ With argument, do this that many times." (LaTeX-mode . company-auctex-init)) ;;;;;;;;;;;;;;;;;;;; (X)HTML / CSS ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Use company auto-completion. +;; Use company auto-completion for (X)HTML. (use-package company-web :after company :config @@ -789,8 +787,10 @@ With argument, do this that many times." (markup-title-0-face ((t (:inherit markup-gen-face :height 1.4)))) (markup-title-1-face ((t (:inherit markup-gen-face :height 1.3)))) (markup-title-2-face ((t (:inherit markup-gen-face :height 1.2)))) - (markup-title-3-face ((t (:inherit markup-gen-face :height 1.1 :weight bold)))) - (markup-title-4-face ((t (:inherit markup-gen-face :height 1.0 :underline t)))) + (markup-title-3-face ((t (:inherit markup-gen-face :height 1.1 + :weight bold)))) + (markup-title-4-face ((t (:inherit markup-gen-face :height 1.0 + :underline t)))) :hook (adoc-mode . visual-line-mode)) @@ -799,13 +799,20 @@ With argument, do this that many times." (markdown-command "cmark") :custom-face ;; Style headers. - (markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.4 :weight normal)))) - (markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.3 :weight normal)))) - (markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.2 :weight normal)))) - (markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.1 :weight bold)))) - (markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.0 :weight normal :underline t)))) - (markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.0 :weight normal)))) - (markdown-header-face-7 ((t (:inherit markdown-header-face :height 1.0 :weight normal)))) + (markdown-header-face-1 ((t (:inherit markdown-header-face :height 1.4 + :weight normal)))) + (markdown-header-face-2 ((t (:inherit markdown-header-face :height 1.3 + :weight normal)))) + (markdown-header-face-3 ((t (:inherit markdown-header-face :height 1.2 + :weight normal)))) + (markdown-header-face-4 ((t (:inherit markdown-header-face :height 1.1 + :weight bold)))) + (markdown-header-face-5 ((t (:inherit markdown-header-face :height 1.0 + :weight normal :underline t)))) + (markdown-header-face-6 ((t (:inherit markdown-header-face :height 1.0 + :weight normal)))) + (markdown-header-face-7 ((t (:inherit markdown-header-face :height 1.0 + :weight normal)))) :mode (("README\\.md\\'" . gfm-mode) ("\\.md\\'" . markdown-mode)