From 07b7a81ef9483a05333fdfeac6b6274cf0a63421 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 20 May 2018 23:12:14 +0100
Subject: [PATCH] Configure truncate-lines and visual-line-mode correctly

---
 modules/editor/siren-fci.el          | 5 +++--
 modules/languages/siren-prog-mode.el | 4 ++--
 modules/languages/siren-text-mode.el | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/editor/siren-fci.el b/modules/editor/siren-fci.el
index 14f3f4b..00fe4b5 100644
--- a/modules/editor/siren-fci.el
+++ b/modules/editor/siren-fci.el
@@ -9,8 +9,9 @@
 (use-package fill-column-indicator
   :hook (prog-mode . fci-mode)
   :config
-  (setq fci-rule-width 1
-        fci-handle-trucate-lines nil))
+  (setq fci-handle-line-move-visual nil
+        fci-handle-truncate-lines nil
+        fci-rule-width 1))
 
 (provide 'siren-fci)
 ;;; siren-fci.el ends here
diff --git a/modules/languages/siren-prog-mode.el b/modules/languages/siren-prog-mode.el
index 464558e..1e4d4fa 100644
--- a/modules/languages/siren-prog-mode.el
+++ b/modules/languages/siren-prog-mode.el
@@ -17,8 +17,8 @@
     (setq fill-column 80
           whitespace-action '(auto-cleanup))
 
-    (visual-line-mode +1)
-    (whitespace-mode +1)))
+    (visual-line-mode t)
+    (whitespace-mode t)))
 
 (provide 'siren-prog-mode)
 ;;; siren-prog-mode.el ends here
diff --git a/modules/languages/siren-text-mode.el b/modules/languages/siren-text-mode.el
index c4b2a4f..c8079bb 100644
--- a/modules/languages/siren-text-mode.el
+++ b/modules/languages/siren-text-mode.el
@@ -11,7 +11,9 @@
   :hook (text-mode . siren-text-mode-setup)
   :init
   (defun siren-text-mode-setup ()
-    (setq fill-column 80)))
+    (setq fill-column 80)
+
+    (visual-line-mode t)))
 
 (provide 'siren-text-mode)
 ;;; siren-text-mode.el ends here