From ae4da2c2489a51ee06efade754df8b53b6042767 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Thu, 22 Sep 2022 14:14:17 +0100 Subject: [PATCH] feat(language/markdown): improve prettier setup Only wrap lines to fill-column when formatting with prettier if auto-fill-mode is enabled. --- modules/languages/siren-markdown.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/languages/siren-markdown.el b/modules/languages/siren-markdown.el index 33b3e88..237dfc2 100644 --- a/modules/languages/siren-markdown.el +++ b/modules/languages/siren-markdown.el @@ -56,9 +56,12 @@ (subword-mode t)) (defun siren-markdown-mode-setup-prettier () - (setq-local prettier-js-args `("--parser" "markdown" - "--print-width" ,(number-to-string fill-column) - "--prose-wrap" "always")))) + (let ((args '("--parser" "markdown"))) + (when (bound-and-true-p auto-fill-function) ;; is auto-fill-mode enabled? + (setq args (append args (list "--print-width" (format "%d" fill-column) + "--prose-wrap" "always")))) + + (setq-local prettier-js-args args)))) ;; Required by markdown-edit-code-block. (use-package edit-indirect