1 files changed, 12 insertions, 1 deletions

@@ -90,6 +90,11 @@
   (global-display-fill-column-indicator-mode +1)
   (global-so-long-mode +1)
 
+  (add-hook 'visual-line-mode-hook
+            (defun acdw/disable-fill-column-indicator ()
+              (display-fill-column-indicator-mode
+               (if visual-line-mode -1 +1))))
+
   ;; Whitespace
   (:option  whitespace-style
             '(empty indentation space-before-tab space-after-tab)
@@ -723,7 +728,13 @@ if ripgrep is installed, otherwise `consult-grep'."
 
 (setup (:straight olivetti)
   (:option olivetti-body-width (+ fill-column 4)
-           olivetti-minimum-body-width fill-column))
+           olivetti-minimum-body-width fill-column)
+  (add-hook 'olivetti-mode-hook
+            (defun acdw/olivetti-mode-hook ()
+              (if olivetti-mode
+                  (setq-local indicate-empty-lines nil
+                              indicate-buffer-boundaries nil)
+                (acdw/setup-regular-modes)))))
 
 (setup (:straight form-feed)
   (global-form-feed-mode +1))