💥 Drop Emacs 25.x support

Emacs 26.1 is Doom's new minimum supported version

Closes #2026

modules/emacs/ibuffer/config.el

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

modules/emacs/vc/config.el

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