💥 Drop Emacs 25.x support

Emacs 26.1 is Doom's new minimum supported version

Closes #2026

modules/lang/data/packages.el

@@ -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 "*")))

modules/lang/rust/config.el

@@ -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

modules/lang/rust/packages.el

@@ -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))
 

modules/lang/web/+css.el

@@ -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

modules/lang/web/+html.el

@@ -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

modules/lang/web/packages.el

@@ -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)