From e8a4cbe0d290f4432f76568dbaccac6805920008 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Sat, 14 Aug 2021 01:51:45 +0000
Subject: [PATCH] Merge branch 'master' of ssh://github.com/Chizi123/.emacs.d
---
config.org | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/config.org b/config.org
index 222d992..1bf6271 100644
--- a/config.org
+++ b/config.org
@@ -817,9 +817,10 @@
(setq lsp-keymap-prefix "C-c l")
:commands lsp
:config
- (add-hook lsp-mode-hook lsp-enable-which-key-integration)
+ (add-hook 'lsp-mode-hook 'lsp-enable-which-key-integration)
(setq read-process-output-max (* 1024 1024))
(setq lsp-completion-provider :capf)
+ (setq lsp-keep-workspace-alive 'nil)
(add-to-list 'exec-path "~/.cargo/bin"))
(use-package lsp-ui
@@ -986,7 +987,7 @@
company-dabbrev-code
company-irony)))
#+END_SRC
-**** COMMENT Clang-format
+**** Clang-format
Automatically format buffer on save.
#+BEGIN_SRC emacs-lisp
(when (file-exists-p "/usr/share/clang/clang-format.el")
@@ -999,12 +1000,12 @@
"IndentCaseLabels: false}"))
(setq-default clang-format-style clang-format-linux-style)
(defun clang-format-on-save ()
- (add-hook 'before-save-hook 'clang-format-buffer))
- (add-hook 'c-mode-hook 'clang-format-on-save)
- (add-hook 'c++-mode-hook 'clang-format-on-save))
+ (add-hook 'before-save-hook 'clang-format-buffer nil t))
+ (add-hook 'c-mode-hook 'clang-format-on-save nil t)
+ (add-hook 'c++-mode-hook 'clang-format-on-save nil t))
#+END_SRC
*** emacs-lisp
-**** COMMENT company
+**** COMMENT Company
Add slime backend.
#+BEGIN_SRC emacs-lisp
(add-hook 'emacs-lisp-mode-hook 'company-mode)
--
Gitblit v1.9.3