💥 Drop Emacs 25.x support
Emacs 26.1 is Doom's new minimum supported version Closes #2026
This commit is contained in:
Henrik Lissner
parent
9cb535043c
commit
99cd52e70f
33 changed files with 48 additions and 426 deletions
|
|
@ -62,7 +62,7 @@
|
|||
|
||||
|
||||
(use-package! company-box
|
||||
:when (and EMACS26+ (featurep! +childframe))
|
||||
:when (featurep! +childframe)
|
||||
:hook (company-mode . company-box-mode)
|
||||
:config
|
||||
(setq company-box-show-single-candidate t
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@
|
|||
(package! company)
|
||||
(package! company-dict)
|
||||
(package! company-prescient)
|
||||
(when (and EMACS26+ (featurep! +childframe))
|
||||
(when (featurep! +childframe)
|
||||
(package! company-box))
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ be negative.")
|
|||
(setq helm-default-prompt-display-function #'+helm--set-prompt-display))
|
||||
|
||||
:init
|
||||
(when (and EMACS26+ (featurep! +childframe))
|
||||
(when (featurep! +childframe)
|
||||
(setq helm-display-function #'+helm-posframe-display-fn))
|
||||
|
||||
(let ((fuzzy (featurep! +fuzzy)))
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
(package! swiper-helm)
|
||||
(when (featurep! +fuzzy)
|
||||
(package! helm-flx))
|
||||
(when (and EMACS26+ (featurep! +childframe))
|
||||
(when (featurep! +childframe)
|
||||
(package! posframe))
|
||||
(when (featurep! :lang org)
|
||||
(package! helm-org))
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
|
|||
|
||||
|
||||
(use-package! ivy-posframe
|
||||
:when (and EMACS26+ (featurep! +childframe))
|
||||
:when (featurep! +childframe)
|
||||
:hook (ivy-mode . ivy-posframe-mode)
|
||||
:config
|
||||
(setq ivy-fixed-height-minibuffer nil
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
;; -*- lexical-binding: t; no-byte-compile: t; -*-
|
||||
;;; completion/ivy/doctor.el
|
||||
|
||||
(when (and (not EMACS26+) (featurep! +childframe))
|
||||
(error! "The +childframe feature requires Emacs 26+"))
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
(when (featurep! +fuzzy)
|
||||
(package! flx)))
|
||||
|
||||
(when (and EMACS26+ (featurep! +childframe))
|
||||
(when (featurep! +childframe)
|
||||
(package! ivy-posframe))
|
||||
|
||||
(when (featurep! +icons)
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ and complains if a module is loaded too early (during startup)."
|
|||
(add-transient-hook! 'emacs-lisp-mode
|
||||
(+evil-collection-init 'elisp-mode))
|
||||
(add-transient-hook! 'occur-mode
|
||||
(+evil-collection-init (if EMACS26+ 'replace "replace")))
|
||||
(+evil-collection-init 'replace))
|
||||
|
||||
(evil-define-key* 'normal process-menu-mode-map
|
||||
"q" #'kill-current-buffer
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
(setq ibuffer-show-empty-filter-groups nil
|
||||
ibuffer-filter-group-name-face '(:inherit (success bold))
|
||||
ibuffer-formats
|
||||
`((mark modified read-only ,(if EMACS26+ 'locked "")
|
||||
`((mark modified read-only locked
|
||||
,@(if (featurep! +icons)
|
||||
`(;; Here you may adjust by replacing :right with :center
|
||||
;; or :left According to taste, if you want the icon
|
||||
|
|
|
|||
|
|
@ -66,14 +66,3 @@ otherwise in default state."
|
|||
(when (and (bound-and-true-p evil-mode)
|
||||
(bobp) (eolp))
|
||||
(evil-insert-state)))))
|
||||
|
||||
|
||||
(after! smerge-mode
|
||||
(unless EMACS26+
|
||||
(with-no-warnings
|
||||
(defalias #'smerge-keep-upper #'smerge-keep-mine)
|
||||
(defalias #'smerge-keep-lower #'smerge-keep-other)
|
||||
(defalias #'smerge-diff-base-upper #'smerge-diff-base-mine)
|
||||
(defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other)
|
||||
(defalias #'smerge-diff-base-lower #'smerge-diff-base-other))))
|
||||
|
||||
|
|
|
|||
|
|
@ -7,8 +7,5 @@
|
|||
(package! yaml-mode)
|
||||
(package! csv-mode)
|
||||
(package! dhall-mode)
|
||||
(package! protobuf-mode :recipe (:host github :repo "emacsmirror/protobuf-mode" :files (:defaults "*")))
|
||||
|
||||
;; DEPRECATED `conf-toml-mode' exists in Emacs 26+
|
||||
(unless (fboundp 'conf-toml-mode)
|
||||
(package! toml-mode))
|
||||
(package! protobuf-mode
|
||||
:recipe (:host github :repo "emacsmirror/protobuf-mode" :files (:defaults "*")))
|
||||
|
|
|
|||
|
|
@ -7,43 +7,13 @@
|
|||
;;
|
||||
;;; Packages
|
||||
|
||||
(use-package! rust-mode
|
||||
:defer t
|
||||
:config
|
||||
(setq rust-indent-method-chain t)
|
||||
(add-hook 'rust-mode-hook #'rainbow-delimiters-mode)
|
||||
|
||||
;; This is necessary because both plugins are fighting for supremacy in
|
||||
;; `auto-mode-alist', so rustic-mode *must* load second. It only needs to
|
||||
;; happen once.
|
||||
;;
|
||||
;; rust-mode is still required for `racer'.
|
||||
(add-hook! 'rust-mode-hook
|
||||
(defun +rust-init-h ()
|
||||
"Switch to `rustic-mode', if it's available."
|
||||
(when (require 'rustic nil t)
|
||||
(rustic-mode))))
|
||||
|
||||
(set-docsets! '(rust-mode rustic-mode) "Rust")
|
||||
(when (featurep! +lsp)
|
||||
(add-hook 'rust-mode-local-vars-hook #'lsp!)))
|
||||
|
||||
|
||||
(use-package! racer
|
||||
:unless (featurep! +lsp)
|
||||
:hook ((rust-mode rustic-mode) . racer-mode)
|
||||
:config
|
||||
(set-lookup-handlers! 'rust-mode
|
||||
:definition '(racer-find-definition :async t)
|
||||
:documentation '+rust-racer-lookup-documentation))
|
||||
|
||||
|
||||
(use-package! rustic
|
||||
:when EMACS26+
|
||||
:after rust-mode
|
||||
:mode ("\\.rs$" . rustic-mode)
|
||||
:preface
|
||||
(setq rustic-rls-pkg (if (featurep! +lsp) 'lsp-mode))
|
||||
:config
|
||||
(set-docsets! 'rustic-mode "Rust")
|
||||
|
||||
(setq rustic-indent-method-chain t
|
||||
rustic-flycheck-setup-mode-line-p nil
|
||||
;; use :editor format instead
|
||||
|
|
@ -52,38 +22,35 @@
|
|||
;; buffers, so we disable it, but only for evil users, because it
|
||||
;; affects `forward-sexp' and its ilk. See
|
||||
;; https://github.com/rust-lang/rust-mode/issues/288.
|
||||
rustic-match-angle-brackets (not (featurep! :editor evil)))
|
||||
rustic-match-angle-brackets (not (featurep! :editor evil))
|
||||
;; `rustic-setup-rls' uses `package-installed-p' to determine if
|
||||
;; lsp-mode/elgot are available. This breaks because Doom doesn't use
|
||||
;; package.el to begin with (and lazy loads it). This is already handled
|
||||
;; by the :tools lsp module, so...
|
||||
rustic-lsp-setup-p nil)
|
||||
|
||||
(add-hook 'rustic-mode-hook #'rainbow-delimiters-mode)
|
||||
|
||||
(defadvice! +rust--dont-install-packages-p (orig-fn &rest args)
|
||||
:around #'rustic-setup-rls
|
||||
(cl-letf (;; `rustic-setup-rls' uses `package-installed-p' to determine if
|
||||
;; lsp-mode/elgot are available. This breaks because Doom doesn't
|
||||
;; use package.el to begin with (and lazy loads it).
|
||||
((symbol-function #'package-installed-p)
|
||||
(lambda (pkg)
|
||||
(require pkg nil t)))
|
||||
;; If lsp/elgot isn't available, it attempts to install lsp-mode
|
||||
;; via package.el. Doom manages its own dependencies so we disable
|
||||
;; that behavior.
|
||||
((symbol-function #'rustic-install-rls-client-p)
|
||||
(lambda (&rest _)
|
||||
(message "No RLS server running"))))
|
||||
(apply orig-fn args))))
|
||||
(when (featurep! +lsp)
|
||||
(add-hook 'rustic-mode-local-vars-hook #'lsp!)))
|
||||
|
||||
|
||||
(use-package! racer
|
||||
:unless (featurep! +lsp)
|
||||
:hook (rustic-mode . racer-mode)
|
||||
:config
|
||||
(set-lookup-handlers! 'rustic-mode
|
||||
:definition '(racer-find-definition :async t)
|
||||
:documentation '+rust-racer-lookup-documentation))
|
||||
|
||||
|
||||
;;
|
||||
;;; Tools
|
||||
|
||||
(use-package! cargo
|
||||
:after rust-mode
|
||||
:after rustic-mode
|
||||
:config
|
||||
(defvar +rust-keymap
|
||||
(if (boundp 'rustic-mode-map)
|
||||
rustic-mode-map
|
||||
rust-mode-map))
|
||||
(map! :map +rust-keymap
|
||||
(map! :map rustic-mode-map
|
||||
:localleader
|
||||
(:prefix ("b" . "build")
|
||||
:desc "cargo add" "a" #'cargo-process-add
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/rust/packages.el
|
||||
|
||||
(when EMACS26+
|
||||
(package! rustic))
|
||||
(package! rust-mode)
|
||||
(package! rustic)
|
||||
(unless (featurep! +lsp)
|
||||
(package! racer))
|
||||
|
||||
|
|
|
|||
|
|
@ -28,12 +28,6 @@
|
|||
(after! css-mode
|
||||
;; css-mode hooks apply to scss and less-css modes
|
||||
(add-hook 'css-mode-hook #'rainbow-delimiters-mode)
|
||||
(set-company-backend! '(css-mode scss-mode)
|
||||
(if EMACS26+
|
||||
;; DEPRECATED css-mode's built in completion is superior in 26+
|
||||
'company-capf
|
||||
'company-css))
|
||||
|
||||
(map! :localleader
|
||||
:map scss-mode-map
|
||||
"b" #'+css/scss-build
|
||||
|
|
|
|||
|
|
@ -41,12 +41,7 @@
|
|||
(setcdr alist
|
||||
(cl-loop for pair in (cdr alist)
|
||||
unless (string-match-p "^[a-z-]" (cdr pair))
|
||||
collect (cons (car pair)
|
||||
;; TODO Replace with `string-trim-right' (Emacs 26+)
|
||||
(let ((string (cdr pair)))
|
||||
(if (string-match "\\(?:>\\|]\\|}\\)+\\'" string)
|
||||
(replace-match "" t t string)
|
||||
string))))))
|
||||
collect (cons (car pair) (string-trim-right (cdr pair))))))
|
||||
(delq! nil web-mode-engines-auto-pairs))
|
||||
|
||||
(map! :map web-mode-map
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
;; +css.el
|
||||
(package! css-mode :built-in t)
|
||||
(package! less-css-mode :built-in (not (version< emacs-version "26.1")))
|
||||
(package! less-css-mode :built-in t)
|
||||
|
||||
(package! sass-mode)
|
||||
(package! stylus-mode)
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ errors.")
|
|||
|
||||
|
||||
(use-package! flycheck-posframe
|
||||
:when EMACS26+
|
||||
:when (featurep! +childframe)
|
||||
:defer t
|
||||
:init (add-hook 'flycheck-mode-hook #'+flycheck-init-popups-h)
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@
|
|||
|
||||
(package! flycheck)
|
||||
(package! flycheck-popup-tip)
|
||||
(when (and EMACS26+ (featurep! +childframe))
|
||||
(when (featurep! +childframe)
|
||||
(package! flycheck-posframe))
|
||||
|
|
|
|||
|
|
@ -106,8 +106,7 @@ Also logs the resolved project root, if found."
|
|||
(defun +lsp-init-ui-flycheck-or-flymake-h ()
|
||||
"Sets up flymake-mode or flycheck-mode, depending on `lsp-prefer-flymake'."
|
||||
(cond ((eq :none lsp-prefer-flymake))
|
||||
((and (not (version< emacs-version "26.1"))
|
||||
lsp-prefer-flymake)
|
||||
(lsp-prefer-flymake
|
||||
(lsp--flymake-setup))
|
||||
((require 'flycheck nil t)
|
||||
(require 'lsp-ui-flycheck)
|
||||
|
|
|
|||
|
|
@ -36,5 +36,5 @@
|
|||
|
||||
|
||||
;; Is built into Emacs 26+
|
||||
(when (and EMACS26+ (featurep! +auth))
|
||||
(when (featurep! +auth)
|
||||
(auth-source-pass-enable))
|
||||
|
|
|
|||
|
|
@ -61,8 +61,8 @@
|
|||
|
||||
;; On Emacs 26+, when point is on the last line and solaire-mode is remapping
|
||||
;; the hl-line face, hl-line's highlight bleeds into the rest of the window
|
||||
;; after eob.
|
||||
(when EMACS26+
|
||||
;; after eob. On Emacs 27 this no longer happens.
|
||||
(unless EMACS27+
|
||||
(defun +doom--line-range-fn ()
|
||||
(cons (line-beginning-position)
|
||||
(cond ((let ((eol (line-end-position)))
|
||||
|
|
|
|||
|
|
@ -28,9 +28,7 @@ Meant for `doom-change-font-size-hook'."
|
|||
xlfd-regexp-pixelsize-subnum)))
|
||||
(scale (frame-parameter nil 'font-scale)))
|
||||
(setq doom-modeline-height (+ default-height (* scale doom-font-increment))))
|
||||
(setq doom-modeline-height default-height))
|
||||
;; already has a variable watcher in Emacs 26+
|
||||
(unless EMACS26+ (doom-modeline-refresh-bars))))
|
||||
(setq doom-modeline-height default-height))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +modeline-update-env-in-all-windows-h (&rest _)
|
||||
|
|
|
|||
|
|
@ -139,11 +139,6 @@ default window parameters for popup windows, clears leftover transient timers
|
|||
and enables `+popup-buffer-mode'."
|
||||
(with-selected-window window
|
||||
(setq alist (delq (assq 'actions alist) alist))
|
||||
(when (and alist +popup--populate-wparams)
|
||||
;; Emacs 26+ will automatically map the window-parameters alist entry to
|
||||
;; the popup window, so we need this for Emacs 25.x users
|
||||
(dolist (param (cdr (assq 'window-parameters alist)))
|
||||
(set-window-parameter window (car param) (cdr param))))
|
||||
(set-window-parameter window 'popup t)
|
||||
(set-window-parameter window 'split-window #'+popup--split-window)
|
||||
(set-window-parameter window 'delete-window #'+popup--delete-window)
|
||||
|
|
@ -617,94 +612,3 @@ This advice ensures backwards compatibility for Emacs <= 26 users."
|
|||
(when (and (windowp window) display-buffer-mark-dedicated)
|
||||
(set-window-dedicated-p window display-buffer-mark-dedicated))
|
||||
window))
|
||||
|
||||
;; DEPRECATED
|
||||
(unless EMACS26+
|
||||
(defvar window-sides-reversed nil)
|
||||
|
||||
(defun window--sides-reverse-on-frame-p (frame)
|
||||
"Return non-nil when side windows should appear reversed on FRAME.
|
||||
This uses some heuristics to guess the user's intentions when the
|
||||
selected window of FRAME is a side window ."
|
||||
(cond
|
||||
;; Reverse when `window-sides-reversed' is t. Do not reverse when
|
||||
;; `window-sides-reversed' is nil.
|
||||
((memq window-sides-reversed '(nil t))
|
||||
window-sides-reversed)
|
||||
;; Reverse when FRAME's selected window shows a right-to-left buffer.
|
||||
((let ((window (frame-selected-window frame)))
|
||||
(when (and (not (window-parameter window 'window-side))
|
||||
(or (not (window-minibuffer-p window))
|
||||
(setq window (minibuffer-selected-window))))
|
||||
(with-current-buffer (window-buffer window)
|
||||
(eq bidi-paragraph-direction 'right-to-left)))))
|
||||
;; Reverse when FRAME's `window-sides-main-selected-window' parameter
|
||||
;; specifies a live window showing a right-to-left buffer.
|
||||
((let ((window (frame-parameter
|
||||
frame 'window-sides-main-selected-window)))
|
||||
(when (window-live-p window)
|
||||
(with-current-buffer (window-buffer window)
|
||||
(eq bidi-paragraph-direction 'right-to-left)))))
|
||||
;; Reverse when all windows in FRAME's main window show right-to-left
|
||||
;; buffers.
|
||||
(t
|
||||
(catch 'found
|
||||
(walk-window-subtree
|
||||
(lambda (window)
|
||||
(with-current-buffer (window-buffer window)
|
||||
(when (eq bidi-paragraph-direction 'left-to-right)
|
||||
(throw 'found nil))))
|
||||
(window-main-window frame))
|
||||
t))))
|
||||
|
||||
(defun window--make-major-side-window (buffer side slot &optional alist)
|
||||
"Display BUFFER in a new major side window on the selected frame.
|
||||
SIDE must be one of `left', `top', `right' or `bottom'. SLOT
|
||||
specifies the slot to use. ALIST is an association list of
|
||||
symbols and values as passed to `display-buffer-in-side-window'.
|
||||
Return the new window, nil if its creation failed.
|
||||
|
||||
This is an auxiliary function of `display-buffer-in-side-window'
|
||||
and may be called only if no window on SIDE exists yet."
|
||||
(let* ((left-or-right (memq side '(left right)))
|
||||
(next-to (window--make-major-side-window-next-to side))
|
||||
(on-side (cond
|
||||
((eq side 'top) 'above)
|
||||
((eq side 'bottom) 'below)
|
||||
(t side)))
|
||||
(window--sides-inhibit-check t)
|
||||
;; The following two bindings will tell `split-window' to take
|
||||
;; the space for the new window from the selected frame's main
|
||||
;; window and not make a new parent window unless needed.
|
||||
(window-combination-resize 'side)
|
||||
(window-combination-limit nil)
|
||||
(window (ignore-errors (split-window next-to nil on-side))))
|
||||
(when window
|
||||
;; Initialize `window-side' parameter of new window to SIDE and
|
||||
;; make that parameter persistent.
|
||||
(set-window-parameter window 'window-side side)
|
||||
(add-to-list 'window-persistent-parameters '(window-side . writable))
|
||||
;; Install `window-slot' parameter of new window and make that
|
||||
;; parameter persistent.
|
||||
(set-window-parameter window 'window-slot slot)
|
||||
(add-to-list 'window-persistent-parameters '(window-slot . writable))
|
||||
;; Auto-adjust height/width of new window unless a size has been
|
||||
;; explicitly requested.
|
||||
(unless (if left-or-right
|
||||
(cdr (assq 'window-width alist))
|
||||
(cdr (assq 'window-height alist)))
|
||||
(setq alist
|
||||
(cons
|
||||
(cons
|
||||
(if left-or-right 'window-width 'window-height)
|
||||
(/ (window-total-size (frame-root-window) left-or-right)
|
||||
;; By default use a fourth of the size of the frame's
|
||||
;; root window.
|
||||
4))
|
||||
alist)))
|
||||
(with-current-buffer buffer
|
||||
(setq window--sides-shown t))
|
||||
;; Install BUFFER in new window and return WINDOW.
|
||||
(window--display-buffer buffer window 'window alist 'side))))
|
||||
|
||||
(advice-add #'window--sides-check :override #'ignore))
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ Modifying this has no effect, unless done before ui/popup loads.")
|
|||
"Size of the margins to give popup windows. Set this to nil to disable margin
|
||||
adjustment.")
|
||||
|
||||
(defvar +popup--populate-wparams (not EMACS26+))
|
||||
(defvar +popup--inhibit-transient nil)
|
||||
(defvar +popup--inhibit-select nil)
|
||||
(defvar +popup--old-display-buffer-alist nil)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue