From 946188e1d6c6ba713f3d34a25c21b395234b043f Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Thu, 23 Jan 2020 18:05:29 -0500 Subject: [PATCH 1/1] emacs: improve compat for (version< "27" emacs-version0 - eshell: it seems that eshell-hist-mode-map is new in 27 - mm-uu: :extend is new in 27. trying to use it pre 27 causes severe breakage of ERC among other things --- .emacs.d/init.el | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 539b045..2228c31 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1036,8 +1036,12 @@ This function is intended for use with `ivy-ignore-buffers'." ("C-S-l" . b/eshell-clear) ("M-r" . counsel-esh-history) ;; ([tab] . company-complete) - :map eshell-hist-mode-map - ("M-r" . counsel-esh-history))) + ) + (if (version< "27" emacs-version) + (bind-keys :map eshell-hist-mode-map + ("M-r" . counsel-esh-history)) + (bind-keys :map eshell-mode-map + ("M-r" . counsel-esh-history)))) :hook (eshell-mode . b/eshell-setup) :custom @@ -2492,7 +2496,8 @@ https://csclub.uwaterloo.ca/~abandali") (use-package mm-uu :config - (set-face-attribute 'mm-uu-extract nil :extend t) + (when (version< "27" emacs-version) + (set-face-attribute 'mm-uu-extract nil :extend t)) :custom (mm-uu-diff-groups-regexp "\\(gmane\\|gnu\\|l\\)\\..*\\(diff\\|commit\\|cvs\\|bug\\|dev\\)")) -- 2.20.1