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

Add more DEPRECATED tags

Browse source 
For Emacs 25 functionality that'll be removed when 25.x support is
dropped.
This commit is contained in:
Henrik Lissner 2019-08-19 21:04:11 -04:00
parent fb619bdb0f
commit 2eb8035f15
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/autoload/ui.el
View file

@ -67,6 +67,7 @@ visual-line-mode is on, this skips relative and uses visual instead.
See `display-line-numbers' for what these values mean." See `display-line-numbers' for what these values mean."
(interactive) (interactive)
(defvar doom--line-number-style display-line-numbers-type) (defvar doom--line-number-style display-line-numbers-type)
;; DEPRECATED
(let* ((styles `(t ,(if (and EMACS26+ visual-line-mode) 'visual 'relative) nil)) (let* ((styles `(t ,(if (and EMACS26+ visual-line-mode) 'visual 'relative) nil))
(order (cons display-line-numbers-type (remq display-line-numbers-type styles))) (order (cons display-line-numbers-type (remq display-line-numbers-type styles)))
(queue (memq doom--line-number-style order)) (queue (memq doom--line-number-style order))
@ -74,6 +75,7 @@ See `display-line-numbers' for what these values mean."
(car order) (car order)
(car (cdr queue))))) (car (cdr queue)))))
(setq doom--line-number-style next) (setq doom--line-number-style next)
;; DEPRECATED
(if EMACS26+ (if EMACS26+
(setq display-line-numbers next) (setq display-line-numbers next)
(pcase next (pcase next

2
core/core-ui.el
View file

@ -493,7 +493,7 @@ treat Emacs as a non-application window."
(defun doom-enable-line-numbers-h () (display-line-numbers-mode +1)) (defun doom-enable-line-numbers-h () (display-line-numbers-mode +1))
(defun doom-disable-line-numbers-h () (display-line-numbers-mode -1)) (defun doom-disable-line-numbers-h () (display-line-numbers-mode -1))
;; `nlinum' is used for Emacs 25 users, as Emacs 26+ has native line numbers. ;; DEPRECATED `nlinum' is used for Emacs 25 users; 26+ has native line numbers.
(use-package! nlinum (use-package! nlinum
;; 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 `linum-mode'. ;; plugin than `linum-mode'.