From a0a72bddc51b443b1b21b0f4233aff072ed7a951 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 26 Jan 2020 22:09:01 +0000
Subject: [PATCH] feat(editor): Add siren-display-fill-column wrapper module

This module wraps around the fill-column-indicator and it's
fci-mode. This will enable easy switch-over to Emacs 27's native
display-fill-column-indicator feature.
---
 core/siren-core-modules.el                  |  2 +-
 modules/editor/siren-display-fill-column.el | 17 +++++++++++++++++
 modules/languages/siren-markdown.el         |  4 ++--
 modules/languages/siren-web-mode.el         |  4 ++--
 modules/org-mode/siren-org-mode.el          |  4 ++--
 modules/version-control/siren-magit.el      |  4 ++--
 6 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 modules/editor/siren-display-fill-column.el

diff --git a/core/siren-core-modules.el b/core/siren-core-modules.el
index d4c5710..4cc11b2 100644
--- a/core/siren-core-modules.el
+++ b/core/siren-core-modules.el
@@ -22,9 +22,9 @@
 
 ;; Editor
 (require 'siren-browse-kill-ring)
+(require 'siren-display-fill-column)
 (require 'siren-display-indentation)
 (require 'siren-display-line-numbers)
-(require 'siren-fci)
 (require 'siren-folding)
 (require 'siren-helm-command)
 (require 'siren-highlight-symbol)
diff --git a/modules/editor/siren-display-fill-column.el b/modules/editor/siren-display-fill-column.el
new file mode 100644
index 0000000..ab5ce8e
--- /dev/null
+++ b/modules/editor/siren-display-fill-column.el
@@ -0,0 +1,17 @@
+;;; siren-display-fill-column.el --- jimeh's Emacs Siren: fill-column configuration.
+
+;;; Commentary:
+
+;; Basic configuration for fill-column.
+
+;;; Code:
+
+(require 'siren-fci)
+
+(defun siren-display-fill-column (&optional arg)
+  "Activate or deactivate visual fill column.
+Optional ARG is passed directly to mode toggle function."
+  (fci-mode (or arg t)))
+
+(provide 'siren-display-fill-column)
+;;; siren-display-fill-column.el ends here
diff --git a/modules/languages/siren-markdown.el b/modules/languages/siren-markdown.el
index d5da830..eef3e89 100644
--- a/modules/languages/siren-markdown.el
+++ b/modules/languages/siren-markdown.el
@@ -6,8 +6,8 @@
 
 ;;; Code:
 
+(require 'siren-display-fill-column)
 (require 'siren-display-line-numbers)
-(require 'siren-fci)
 (require 'siren-flyspell)
 (require 'siren-move-dup)
 (require 'siren-prettier-js)
@@ -36,10 +36,10 @@
     (setq markdown-asymmetric-header t
           whitespace-action nil)
 
+    (siren-display-fill-column)
     (siren-display-line-numbers)
     (auto-fill-mode)
     (prettier-js-mode)
-    (fci-mode)
     (flyspell-mode)
     (smartparens-mode +1)
     (subword-mode))
diff --git a/modules/languages/siren-web-mode.el b/modules/languages/siren-web-mode.el
index e824c4b..350745a 100644
--- a/modules/languages/siren-web-mode.el
+++ b/modules/languages/siren-web-mode.el
@@ -7,7 +7,7 @@
 ;;; Code:
 
 (require 'siren-company)
-(require 'siren-fci)
+(require 'siren-display-fill-column)
 (require 'siren-folding)
 
 (use-package web-mode
@@ -35,8 +35,8 @@
     "Default tweaks for `web-mode'."
     (setq tab-width 2)
 
+    (siren-display-fill-column -1)
     (company-mode +1)
-    (fci-mode -1)
     (siren-folding)
     (subword-mode +1)))
 
diff --git a/modules/org-mode/siren-org-mode.el b/modules/org-mode/siren-org-mode.el
index 500c3b5..eea8616 100644
--- a/modules/org-mode/siren-org-mode.el
+++ b/modules/org-mode/siren-org-mode.el
@@ -6,9 +6,9 @@
 
 ;;; Code:
 
+(require 'siren-display-fill-column)
 (require 'siren-display-indentation)
 (require 'siren-display-line-numbers)
-(require 'siren-fci)
 (require 'siren-flyspell)
 (require 'siren-smartparens)
 
@@ -39,10 +39,10 @@
     (org-set-emph-re 'org-emphasis-regexp-components
                      org-emphasis-regexp-components)
 
+    (siren-display-fill-column)
     (siren-display-indentation)
     (siren-display-line-numbers)
     (flyspell-mode)
-    (fci-mode)
     (smartparens-mode +1)
     (visual-line-mode +1)
     (whitespace-mode +1)))
diff --git a/modules/version-control/siren-magit.el b/modules/version-control/siren-magit.el
index fbb4af8..48985e0 100644
--- a/modules/version-control/siren-magit.el
+++ b/modules/version-control/siren-magit.el
@@ -6,8 +6,8 @@
 
 ;;; Code:
 
+(require 'siren-display-fill-column)
 (require 'siren-display-line-numbers)
-(require 'siren-fci)
 (require 'siren-flyspell)
 
 (use-package magit
@@ -44,9 +44,9 @@
     (setq tab-width 2
           fill-column 72)
 
+    (siren-display-fill-column)
     (siren-display-line-numbers)
     (subword-mode)
-    (fci-mode t)
     (flyspell-mode)
     (auto-fill-mode))