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 | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/config.org b/config.org
index 0a78944..1bf6271 100644
--- a/config.org
+++ b/config.org
@@ -772,7 +772,6 @@
(use-package flycheck
:ensure t
:diminish flycheck-mode
- :hook (prog-mode . flycheck-mode)
:config
(global-flycheck-mode))
#+END_SRC
@@ -818,7 +817,7 @@
(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)
@@ -988,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")
@@ -1001,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)
@@ -1085,7 +1084,7 @@
(defun get-texcount-latest()
(if (not(file-directory-p "~/.texcount"))
(make-directory "~/.texcount"))
- (url-copy-file "https://app.uio.no/ifi/texcount/download.php?file=texcount_3_1_1.zip" "~/.texcount/texcount.zip" 1)
+ (url-copy-file "https://app.uio.no/ifi/texcount/download.php?file=texcount_3_2_0_41.zip" "~/.texcount/texcount.zip" 1)
(shell-command "unzip -o ~/.texcount/texcount.zip -d ~/.texcount")
(add-to-list 'exec-path "~/.texcount/texcount.pl"))
@@ -1369,8 +1368,9 @@
#+END_SRC
** Org export additions
-*** COMMENT Pandoc
+*** Pandoc
Call pandoc on org buffer from org export.
+Need to add ~#+OPTIONS: H:99~ to enable large level header exports.
#+BEGIN_SRC emacs-lisp
(use-package ox-pandoc
:ensure t)
--
Gitblit v1.9.3