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

Fix #4691: half revert 7e9911f642

Browse source 
Seems this was not fixed upstream.
This commit is contained in:
Henrik Lissner 2021-02-24 18:05:50 -05:00
parent 7f6bcb8616
commit d52abd37f7
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
core/core-editor.el
View file

@ -435,8 +435,23 @@ files, so we replace calls to `pp' with the much faster `prin1'."
(setq dtrt-indent-max-lines 2000) (setq dtrt-indent-max-lines 2000)
;; always keep tab-width up-to-date ;; always keep tab-width up-to-date
(push '(t tab-width) dtrt-indent-hook-generic-mapping-list)) (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)))))
(use-package! helpful (use-package! helpful
;; a better *help* buffer ;; a better *help* buffer