emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bump :core

Browse source 
domtronn/all-the-icons.el@5fa7283 -> domtronn/all-the-icons.el@2f5ea72
jscheid/dtrt-indent@854b9a1 -> jscheid/dtrt-indent@4a30d8e
jwiegley/use-package@317137b -> jwiegley/use-package@a7422fb
raxod502/straight.el@f2cb888 -> raxod502/straight.el@0f9b828

Remove dtrt-indent+smie fix (was fixed upstream)
This commit is contained in:
Henrik Lissner 2021-02-11 17:03:10 -05:00
parent 76636d4a98
commit 7e9911f642
2 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
core/core-editor.el
View file

@ -400,6 +400,8 @@ files, so we replace calls to `pp' with the much faster `prin1'."
(use-package! dtrt-indent
;; Automatic detection of indent settings
:when doom-interactive-p
;; I'm not using `global-dtrt-indent-mode' because it has hard-coded and rigid
;; major mode checks, so I implement it in `doom-detect-indentation-h'.
:hook ((change-major-mode-after-body read-only-mode) . doom-detect-indentation-h)
:config
(defun doom-detect-indentation-h ()
@ -419,23 +421,7 @@ files, so we replace calls to `pp' with the much faster `prin1'."
(setq dtrt-indent-max-lines 2000)
;; always keep tab-width up-to-date
(push '(t tab-width) dtrt-indent-hook-generic-mapping-list)
(defvar dtrt-indent-run-after-smie)
(defadvice! doom--fix-broken-smie-modes-a (orig-fn arg)
"Some smie modes throw errors when trying to guess their indentation, like
`nim-mode'. This prevents them from leaving Emacs in a broken state."
:around #'dtrt-indent-mode
(let ((dtrt-indent-run-after-smie dtrt-indent-run-after-smie))
(letf! ((defun symbol-config--guess (beg end)
(funcall symbol-config--guess beg (min end 10000)))
(defun smie-config-guess ()
(condition-case e (funcall smie-config-guess)
(error (setq dtrt-indent-run-after-smie t)
(message "[WARNING] Indent detection: %s"
(error-message-string e))
(message ""))))) ; warn silently
(funcall orig-fn arg)))))
(push '(t tab-width) dtrt-indent-hook-generic-mapping-list))
(use-package! helpful