From 9a4cce8d9a77759374efc821aa9ef3f9283a4cfd Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 21 Aug 2018 04:10:18 +0200
Subject: [PATCH] Refactor detection of native display-line-numbers

---
 core/autoload/line-numbers.el | 2 ++
 core/core-ui.el               | 6 +++---
 core/packages.el              | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/autoload/line-numbers.el b/core/autoload/line-numbers.el
index 279d2fbac..576cf61b5 100644
--- a/core/autoload/line-numbers.el
+++ b/core/autoload/line-numbers.el
@@ -26,6 +26,8 @@ relative number of a line.
 Lisp programs can disable display of a line number of a particular
 buffer line by putting the display-line-numbers-disable text property
 or overlay property on the first visible character of that line.")
+;;;###autoload
+(put 'display-line-numbers 'nlinum t)
 
 ;;;###autoload
 (defcustom display-line-numbers-type t
diff --git a/core/core-ui.el b/core/core-ui.el
index 383e70856..10ee7988b 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -304,7 +304,7 @@ from the default."
 ;; Line number column. A faster (or equivalent, in the worst case) line number
 ;; plugin than `linum-mode'.
 (def-package! nlinum
-  :unless (boundp 'display-line-numbers)
+  :when (get 'display-line-numbers 'nlinum)
   :commands nlinum-mode
   :init
   (defvar doom-line-number-lpad 4
@@ -352,7 +352,7 @@ character that looks like a space that `whitespace-mode' won't affect.")
 
 ;; Fixes disappearing line numbers in nlinum and other quirks
 (def-package! nlinum-hl
-  :unless (boundp 'display-line-numbers)
+  :when (get 'display-line-numbers 'nlinum)
   :after nlinum
   :config
   ;; With `markdown-fontify-code-blocks-natively' enabled in `markdown-mode',
@@ -367,7 +367,7 @@ character that looks like a space that `whitespace-mode' won't affect.")
   (advice-add #'set-frame-font :after #'nlinum-hl-flush-all-windows))
 
 (def-package! nlinum-relative
-  :unless (boundp 'display-line-numbers)
+  :when (get 'display-line-numbers 'nlinum)
   :commands (nlinum-relative-mode nlinum-relative-on nlinum-relative-off)
   :config
   (setq nlinum-format " %d ")
diff --git a/core/packages.el b/core/packages.el
index bbe27d438..6ad7e7f87 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -13,7 +13,7 @@
 (package! highlight-numbers)
 (package! highlight-escape-sequences
   :recipe (:fetcher github :repo "hlissner/highlight-escape-sequences"))
-(unless (boundp 'display-line-numbers)
+(unless (locate-library "display-line-numbers")
   (package! nlinum)
   (package! nlinum-hl)
   (package! nlinum-relative))