From 07e7b4b41edead248ae02cfca69402216124e31c Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 24 Apr 2026 03:37:08 -0400 Subject: [PATCH] feat(word-wrap): accept minor modes in +word-wrap-visual-modes And instead of disabling +word-wrap in org-mode wholesale, only disable it in the presence of `org-indent-mode` (or `markdown-indent-mode`) -- modes that use `line-prefix`/`wrap-prefix` text properties that could conflict with `adaptive-wrap-prefix-mode` (which the word-wrap module uses). --- modules/editor/word-wrap/autoload.el | 6 +++++- modules/editor/word-wrap/config.el | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/editor/word-wrap/autoload.el b/modules/editor/word-wrap/autoload.el index 40d67ea59..9befe8457 100644 --- a/modules/editor/word-wrap/autoload.el +++ b/modules/editor/word-wrap/autoload.el @@ -48,7 +48,11 @@ wrapped at `fill-column' by configuring `+word-wrap-fill-style'." (progn (setq-local +word-wrap--major-mode-is-visual - (memq major-mode +word-wrap-visual-modes) + (cl-loop for mode in +word-wrap-visual-modes + if (or (eq major-mode mode) + (and (boundp mode) + (symbol-value mode))) + return t) +word-wrap--major-mode-is-text (memq major-mode +word-wrap-text-modes) +word-wrap--enable-adaptive-wrap-mode diff --git a/modules/editor/word-wrap/config.el b/modules/editor/word-wrap/config.el index 337888d52..56bf2eb52 100644 --- a/modules/editor/word-wrap/config.el +++ b/modules/editor/word-wrap/config.el @@ -36,9 +36,8 @@ will not be affected." :type '(repeat symbol) :group '+word-wrap) -(defcustom +word-wrap-visual-modes '(org-mode) - "Major-modes where `+word-wrap-mode' should not use -`adaptive-wrap-prefix-mode'.") +(defcustom +word-wrap-visual-modes '(org-indent-mode markdown-indent-mode) + "Major or minor modes where `adaptive-wrap-prefix-mode' show not be used." :type '(repeat symbol) :group '+word-wrap)