fixing a bunch of broken stuff I think
This commit is contained in:
parent
0dbc3ead0e
commit
8bace887a2
1551 changed files with 299 additions and 57481 deletions
17
init.el
17
init.el
|
@ -504,8 +504,12 @@ vertically."
|
|||
(setq format-all-formatters '("Emacs Lisp" emacs-lisp))
|
||||
:defer 1)
|
||||
|
||||
<<<<<<< HEAD
|
||||
(defvar read-symbol-positions-list nil)
|
||||
(add-hook 'comint-mode-hook 'ansi-color-for-comint-mode-on)
|
||||
=======
|
||||
(add-hook 'c++-mode-hook 'lsp)
|
||||
>>>>>>> bc54f870 (fixing a bunch of broken stuff I think)
|
||||
|
||||
(use-package lua-mode
|
||||
:mode ("\\.lua\\'" . lua-mode))
|
||||
|
@ -1773,3 +1777,16 @@ interfere with the default `bongo-playlist-buffer'."
|
|||
gcmh-verbose nil))
|
||||
|
||||
(setq warning-suppress-types '((comp)))
|
||||
(custom-set-variables
|
||||
;; custom-set-variables was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
'(safe-local-variable-values
|
||||
'((eval org-odt-styles-file "/home/chris/org/tfcexpenses2020.odt"))))
|
||||
(custom-set-faces
|
||||
;; custom-set-faces was added by Custom.
|
||||
;; If you edit it by hand, you could mess it up, so be careful.
|
||||
;; Your init file should contain only one such instance.
|
||||
;; If there is more than one, they won't work right.
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue