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

Change doom/toggle-line-numbers to cycle styles #376

Browse source 
Also fixes doom/toggle-line-numbers when doom-line-numbers-style is nil.
This commit is contained in:
Henrik Lissner 2018-01-30 01:10:16 -05:00
parent 1fda25ce9a
commit 01787fc876
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 37 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/core-ui.el
View file

@ -319,13 +319,15 @@ DEFAULT is non-nil, set the default mode-line for all buffers."
;;
(defvar doom-line-numbers-style t
"The style to use for the line number display.
"The default styles to use for the line number display.
Accepts the same arguments as `display-line-numbers', which are:
Takes the same argument as `display-line-numbers' in Emacs 26, which are:
nil No line numbers
t Ordinary line numbers
'relative Relative line numbers")
nil No line numbers
t Ordinary line numbers
'relative Relative line numbers
Use `doom/toggle-line-numbers' to cycle between these line number styles.")
(defun doom|enable-line-numbers (&optional arg)
"Enables the display of line numbers, using `display-line-numbers' (in Emacs
@ -333,13 +335,9 @@ t Ordinary line numbers
See `doom-line-numbers-style' to control the style of line numbers to display."
(cond ((boundp 'display-line-numbers)
(setq display-line-numbers
(pcase arg
(+1 doom-line-numbers-style)
(-1 nil)
(_ doom-line-numbers-style))))
(setq display-line-numbers (unless (eq arg -1) doom-line-numbers-style)))
((eq doom-line-numbers-style 'relative)
(if (= arg -1)
(if (eq arg -1)
(nlinum-relative-off)
(nlinum-relative-on)))
((not (null doom-line-numbers-style))
@ -418,8 +416,7 @@ character that looks like a space that `whitespace-mode' won't affect.")
(def-package! nlinum-relative
:unless (boundp 'display-line-numbers)
:commands nlinum-relative-mode
:config
(after! evil (nlinum-relative-setup-evil)))
:config (after! evil (nlinum-relative-setup-evil)))
;;