From 31ef06e8641187ad7ac01ba2278eb4d25305a2c4 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Sat, 20 May 2023 22:27:47 +0800 Subject: [PATCH 1/5] Fix #404: Emacs freezes at shutdown. --- lisp/init-flymake.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/init-flymake.el b/lisp/init-flymake.el index 7d2936964..4dfbfbefc 100644 --- a/lisp/init-flymake.el +++ b/lisp/init-flymake.el @@ -32,8 +32,8 @@ (use-package flymake :hook (prog-mode . flymake-mode) - :init (setq flymake-fringe-indicator-position 'right-fringe) - :config (add-to-list 'elisp-flymake-byte-compile-load-path load-path)) + :init (setq flymake-fringe-indicator-position 'right-fringe + elisp-flymake-byte-compile-load-path load-path)) (use-package flymake-diagnostic-at-point :commands flymake-diagnostic-at-point-mode From 8cbec0c132cd6de06a8c293598a720d377f3f5b9 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Mon, 22 May 2023 11:07:36 +0800 Subject: [PATCH 2/5] Refactor use-package. --- lisp/init-package.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lisp/init-package.el b/lisp/init-package.el index ae50c3667..d80bba82b 100644 --- a/lisp/init-package.el +++ b/lisp/init-package.el @@ -59,7 +59,7 @@ ;; HACK: DO NOT save package-selected-packages to `custom-file'. ;; https://github.com/jwiegley/use-package/issues/383#issuecomment-247801751 (defun my-package--save-selected-packages (&optional value) - "Set `package-selected-packages' to VALUE but don't save to `custom-file'." + "Set `package-selected-packages' to VALUE but don't save to variable `custom-file'." (when value (setq package-selected-packages value)) (unless after-init-time @@ -89,9 +89,8 @@ (eval-when-compile (require 'use-package)) -;; Required by `use-package' +;; Don't display minor modes (use-package diminish) -(use-package bind-key) ;; Update GPG keyring for GNU ELPA (use-package gnu-elpa-keyring-update) From 00f25c86d2efc9067364e2173d102a4bf1b460ad Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Mon, 12 Jun 2023 15:07:59 +0800 Subject: [PATCH 3/5] Fix CI error: Invalid face underline: :style, wave, :color, nil --- lisp/init-lsp.el | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lisp/init-lsp.el b/lisp/init-lsp.el index 3098bdf80..f94399b05 100644 --- a/lisp/init-lsp.el +++ b/lisp/init-lsp.el @@ -54,23 +54,6 @@ :defines (lsp-diagnostics-disabled-modes lsp-clients-python-library-directories) :autoload lsp-enable-which-key-integration :commands (lsp-format-buffer lsp-organize-imports) - :custom-face - (lsp-headerline-breadcrumb-path-error-face ((t :inherit lsp-headerline-breadcrumb-path-face - :underline (:style wave :color ,(face-foreground 'error))))) - (lsp-headerline-breadcrumb-path-warning-face ((t :inherit lsp-headerline-breadcrumb-path-face - :underline (:style wave :color ,(face-foreground 'warning))))) - (lsp-headerline-breadcrumb-path-info-face ((t :inherit lsp-headerline-breadcrumb-path-face - :underline (:style wave :color ,(face-foreground 'success))))) - (lsp-headerline-breadcrumb-path-hint-face ((t :inherit lsp-headerline-breadcrumb-path-face - :underline (:style wave :color ,(face-foreground 'success))))) - (lsp-headerline-breadcrumb-symbols-error-face ((t :inherit lsp-headerline-breadcrumb-symbols-face - :underline (:style wave :color ,(face-foreground 'error))))) - (lsp-headerline-breadcrumb-symbols-warning-face ((t :inherit lsp-headerline-breadcrumb-symbols-face - :underline (:style wave :color ,(face-foreground 'warning))))) - (lsp-headerline-breadcrumb-symbols-info-face ((t :inherit lsp-headerline-breadcrumb-symbols-face - :underline (:style wave :color ,(face-foreground 'success))))) - (lsp-headerline-breadcrumb-symbols-hint-face ((t :inherit lsp-headerline-breadcrumb-symbols-face - :underline (:style wave :color ,(face-foreground 'success))))) :hook ((prog-mode . (lambda () (unless (derived-mode-p 'emacs-lisp-mode 'lisp-mode 'makefile-mode 'snippet-mode) (lsp-deferred)))) From 1d85bf72f86317a3a11890661ca06ff8caac0974 Mon Sep 17 00:00:00 2001 From: Vincent Zhang Date: Sun, 18 Jun 2023 22:33:50 +0800 Subject: [PATCH 4/5] Bump version. --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 8fe37a8c3..8ca767fff 100644 --- a/init.el +++ b/init.el @@ -4,7 +4,7 @@ ;; Author: Vincent Zhang ;; URL: https://github.com/seagle0128/.emacs.d -;; Version: 7.0.0 +;; Version: 7.1.0 ;; Keywords: .emacs.d centaur ;; From 85554195f81c5eb403b564d29e3fd3324bafecba Mon Sep 17 00:00:00 2001 From: x4lldux Date: Wed, 5 Jul 2023 05:32:52 +0200 Subject: [PATCH 5/5] Fix missing icon error in LSP-UI hydra (#407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes missing icon error in LSP-UI hydra > nerd-icons-faicon: Unable to find icon with name ‘nf-fa-rocket_launch’ in icon set ‘faicon’` --- lisp/init-lsp.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/init-lsp.el b/lisp/init-lsp.el index f94399b05..03f3f0c0f 100644 --- a/lisp/init-lsp.el +++ b/lisp/init-lsp.el @@ -161,7 +161,7 @@ :custom-face (lsp-ui-sideline-code-action ((t (:inherit warning)))) :pretty-hydra - ((:title (pretty-hydra-title "LSP UI" 'faicon "nf-fa-rocket_launch" :face 'nerd-icons-green) + ((:title (pretty-hydra-title "LSP UI" 'faicon "nf-fa-rocket" :face 'nerd-icons-green) :color amaranth :quit-key ("q" "C-g")) ("Doc" (("d e" (progn