From e863b6251ec21beaa6126f447e1e7856c62ebae8 Mon Sep 17 00:00:00 2001 From: duianto Date: Mon, 4 Nov 2019 09:38:37 +0100 Subject: [PATCH] [julia] Limit evil-surround redefinitions to julia-mode problem: The julia layer redefines evil-surround `b` globally to: begin end solution: Limit the redefinition to julia-mode buffers. --- CHANGELOG.develop | 2 ++ layers/+lang/julia/packages.el | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index 2fdc003d5..6a3ac95b5 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -2133,6 +2133,8 @@ Other: - Fixes: - Loaded =lsp-julia= from melpa (thanks to Guido Kraemer) - Fixed =julia-mode-local-vars-hook= (thanks to Guido Kraemer) + - Limited =evil-surround-pairs-alist= redefinitions to julia mode + (thanks to duianto) **** Keyboard layout - Added support for Colemak layout (thanks to Daniel Mijares, Lyall Cooper and Eivind Fonn) diff --git a/layers/+lang/julia/packages.el b/layers/+lang/julia/packages.el index 3599993c4..46a8a926d 100644 --- a/layers/+lang/julia/packages.el +++ b/layers/+lang/julia/packages.el @@ -88,11 +88,16 @@ (defun julia/post-init-evil-surround () - (with-eval-after-load 'evil-surround - (add-to-list 'evil-surround-pairs-alist '(?b . ("begin " . " end"))) - (add-to-list 'evil-surround-pairs-alist '(?q . ("quote " . " end"))) - (add-to-list 'evil-surround-pairs-alist '(?: . (":(" . ")"))) - (add-to-list 'evil-surround-pairs-alist '(?l . ("let " . " end"))))) + (use-package evil-surround + :config + (progn + (add-hook + 'julia-mode-hook + #'(lambda () + (add-to-list 'evil-surround-pairs-alist '(?b . ("begin " . " end"))) + (add-to-list 'evil-surround-pairs-alist '(?q . ("quote " . " end"))) + (add-to-list 'evil-surround-pairs-alist '(?: . (":(" . ")"))) + (add-to-list 'evil-surround-pairs-alist '(?l . ("let " . " end")))))))) (defun julia/init-lsp-julia () (use-package lsp-julia