From 59846473ca2b485aa25cfba333a9e8757590ce76 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 27 Dec 2017 18:20:58 -0500
Subject: [PATCH] visual-fill-column: account for emacs 26 line numbers

---
 core/core-ui.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/core-ui.el b/core/core-ui.el
index 2252b3df5..3ed1cf764 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -317,8 +317,12 @@ local value, whether or not it's permanent-local. Therefore, we cycle
 (def-package! visual-fill-column
   :commands visual-fill-column-mode
   :config
-  (setq-default visual-fill-column-center-text nil
-                visual-fill-column-width fill-column))
+  (setq-default
+   visual-fill-column-center-text t
+   visual-fill-column-width
+   ;; take Emacs 26 line numbers into account
+   (+ (if (boundp 'display-line-numbers) 6 0)
+      fill-column)))
 
 
 ;;