Drop Emacs 25 support

This commit is contained in:
condy 2021-07-19 01:51:04 +08:00 committed by Youmu
parent 14f1753979
commit 8d10ad4ea5
2 changed files with 1 additions and 19 deletions

View File

@ -67,23 +67,6 @@ See https://github.com/emacs-evil/evil-collection/issues/60 for more details."))
See https://github.com/emacs-evil/evil-collection/issues/60 for more details.")
(require 'evil-integration))
;; Compatibility
(eval-and-compile
(with-no-warnings
(if (version< emacs-version "26")
(progn
(defalias 'evil-collection-if-let* #'if-let)
(defalias 'evil-collection-when-let* #'when-let)
(function-put #'evil-collection-if-let* 'lisp-indent-function 2)
(function-put #'evil-collection-when-let* 'lisp-indent-function 1))
(defalias 'evil-collection-if-let* #'if-let*)
(defalias 'evil-collection-when-let* #'when-let*))))
;; Compatibility
(declare-function org-table-align "org-table.el" nil)
(defgroup evil-collection nil
"A set of keybindings for Evil mode"
:group 'evil)

View File

@ -36,8 +36,7 @@
(defun evil-collection-evil-mc-clear-keymap (&rest _args)
"Brute force remove `evil-mc-key-map' from `evil-mode-map-alist'."
(evil-collection-when-let*
((evil-mc-map (assq 'evil-mc-mode evil-mode-map-alist)))
(when-let ((evil-mc-map (assq 'evil-mc-mode evil-mode-map-alist)))
(setq evil-mode-map-alist
(delq evil-mc-map evil-mode-map-alist))))