dev: merging from master

This commit is contained in:
Matt Nish-Lapidus 2024-06-20 17:16:30 -04:00
commit 42ca269a2e

View file

@ -66,7 +66,10 @@ wrapped at `fill-column' by configuring `+word-wrap-fill-style'."
(unless +word-wrap--major-mode-is-visual (unless +word-wrap--major-mode-is-visual
(require 'dtrt-indent) ; for dtrt-indent--search-hook-mapping (require 'dtrt-indent) ; for dtrt-indent--search-hook-mapping
(setq-local +word-wrap--major-mode-indent-var (setq-local +word-wrap--major-mode-indent-var
(caddr (dtrt-indent--search-hook-mapping major-mode))) (let ((indent-var (caddr (dtrt-indent--search-hook-mapping major-mode))))
(if (listp indent-var)
(car indent-var)
indent-var)))
(advice-add #'adaptive-wrap-fill-context-prefix :around #'+word-wrap--adjust-extra-indent-a)) (advice-add #'adaptive-wrap-fill-context-prefix :around #'+word-wrap--adjust-extra-indent-a))