emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add display-line-numbers support in Emacs 26 #59

Browse source
This commit is contained in:
Henrik Lissner 2017-07-12 14:53:27 +02:00
parent e87d278811
commit c0bfaec9d4
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/autoload/ui.el
View file

@ -13,7 +13,9 @@
(defun doom/toggle-line-numbers (&optional arg) (defun doom/toggle-line-numbers (&optional arg)
"Toggle `linum-mode'." "Toggle `linum-mode'."
(interactive "P") (interactive "P")
(cond ((featurep 'nlinum) (cond ((boundp 'display-line-numbers)
(setq display-line-numbers (not display-line-numbers)))
((featurep 'nlinum)
(nlinum-mode (or arg (if nlinum-mode -1 +1)))) (nlinum-mode (or arg (if nlinum-mode -1 +1))))
((featurep 'linum) ((featurep 'linum)
(linum-mode (or arg (if linum-mode -1 +1)))) (linum-mode (or arg (if linum-mode -1 +1))))

12
core/core-ui.el
View file

@ -256,6 +256,13 @@ local value, whether or not it's permanent-local. Therefore, we cycle
(add-hook! '(doom-post-init-hook minibuffer-setup-hook) (add-hook! '(doom-post-init-hook minibuffer-setup-hook)
#'doom|no-fringes-in-minibuffer) #'doom|no-fringes-in-minibuffer)
;; line numbers in newer version of Emacs
(when (boundp 'display-line-numbers)
(defun doom|init-line-numbers ()
(unless (eq major-mode 'org-mode)
(setq display-line-numbers t)))
(add-hook! (prog-mode text-mode) #'doom|init-line-numbers))
;; ;;
;; Plugins ;; Plugins
@ -318,8 +325,10 @@ local value, whether or not it's permanent-local. Therefore, we cycle
(add-hook 'evil-visual-state-exit-hook #'hl-line-mode))) (add-hook 'evil-visual-state-exit-hook #'hl-line-mode)))
;; Line number column. A faster (or equivalent, in the worst case) line number ;; Line number column. A faster (or equivalent, in the worst case) line number
;; plugin than the built-in `linum'. ;; plugin than the built-in `linum'. This will be ignored if you're using Emacs
;; 26.1+, which has native line number support.
(def-package! nlinum (def-package! nlinum
:unless (boundp 'display-line-numbers)
:commands nlinum-mode :commands nlinum-mode
:init :init
(defun doom|init-nlinum-mode () (defun doom|init-nlinum-mode ()
@ -357,6 +366,7 @@ local value, whether or not it's permanent-local. Therefore, we cycle
;; Fixes disappearing line numbers in nlinum and other quirks ;; Fixes disappearing line numbers in nlinum and other quirks
(def-package! nlinum-hl (def-package! nlinum-hl
:unless (boundp 'display-line-numbers)
:after nlinum :after nlinum
:config :config
;; With `markdown-fontify-code-blocks-natively' enabled in `markdown-mode', ;; With `markdown-fontify-code-blocks-natively' enabled in `markdown-mode',

5
core/packages.el
View file

@ -17,8 +17,9 @@
(package! fringe-helper) (package! fringe-helper)
(package! highlight-indentation) (package! highlight-indentation)
(package! highlight-numbers) (package! highlight-numbers)
(package! nlinum) (unless (boundp 'display-line-numbers)
(package! nlinum-hl) (package! nlinum)
(package! nlinum-hl))
(package! rainbow-delimiters) (package! rainbow-delimiters)
(package! vi-tilde-fringe) (package! vi-tilde-fringe)
(package! visual-fill-column) (package! visual-fill-column)