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

@@ -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)

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

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))

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)))
 

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)))

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))