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

41
core/autoload/ui.el
View file

@ -9,21 +9,34 @@
(unless (frame-parameter nil 'fullscreen)
'fullboth)))
(defvar doom--line-number-style doom-line-numbers-style)
;;;###autoload
(defun doom/toggle-line-numbers (&optional arg)
"Toggle `linum-mode'."
(interactive "P")
(cond ((boundp 'display-line-numbers)
(setq display-line-numbers
(pcase arg
('(4) 'relative)
(1 t)
(-1 nil)
(_ (not display-line-numbers)))))
((featurep 'nlinum)
(nlinum-mode (or arg (if nlinum-mode -1 +1))))
(t
(error "No line number plugin detected"))))
(defun doom/toggle-line-numbers ()
"Toggle line numbers.
Cycles through regular, relative and no line numbers. The order depends on what
`doom-line-numbers-style' is set to.
Uses `display-line-numbers' in Emacs 26+ and `nlinum-mode' everywhere else."
(interactive)
(let* ((order (pcase doom-line-numbers-style
(`relative '(relative t nil))
(`t '(t relative nil))
(`nil '(nil t relative))))
(queue (memq doom--line-number-style order))
(next (if (= (length queue) 1)
(car order)
(car (cdr queue)))))
(setq doom--line-number-style next)
(cond ((boundp 'display-line-numbers)
(setq display-line-numbers next))
((featurep 'nlinum)
(pcase next
(`t (nlinum-relative-mode -1) (nlinum-mode +1))
(`relative (nlinum-relative-mode +1))
(`nil (nlinum-mode -1))))
(t
(error "No line number plugin detected")))))
;;;###autoload
(defun doom-resize-window (window new-size &optional horizontal force-p)