From 1cc199497db619264d31ee414bd57611f5c0e76b Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 28 May 2017 15:32:16 +0200
Subject: [PATCH] Silence evil-matchit errors

---
 modules/feature/evil/autoload/evil.el  |  6 ++++++
 modules/feature/evil/autoload/folds.el | 15 ++++++++-------
 modules/feature/evil/config.el         |  3 ++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/modules/feature/evil/autoload/evil.el b/modules/feature/evil/autoload/evil.el
index 49fb264d3..b552222a8 100644
--- a/modules/feature/evil/autoload/evil.el
+++ b/modules/feature/evil/autoload/evil.el
@@ -2,6 +2,12 @@
 
 (eval-when-compile (require 'subr-x))
 
+;;;###autoload
+(defun +evil/matchit ()
+  "Invoke `evil-matchit', but silently."
+  (interactive)
+  (ignore-errors (call-interactively #'evilmi-jump-items)))
+
 ;;;###autoload
 (defun +evil/visual-indent ()
   "vnoremap < <gv"
diff --git a/modules/feature/evil/autoload/folds.el b/modules/feature/evil/autoload/folds.el
index 8ec918209..9d0c891aa 100644
--- a/modules/feature/evil/autoload/folds.el
+++ b/modules/feature/evil/autoload/folds.el
@@ -71,10 +71,11 @@
 `hs-toggle-hiding'. Otherwise, if on a delimiter, jump to the matching one with
 `evilmi-jump-items'. If in a magit-status buffer, use `magit-section-toggle'."
   (interactive)
-  (call-interactively
-   (cond ((eq major-mode 'magit-status-mode)
-          #'magit-section-toggle)
-         ((+evil-fold-p)
-          #'+evil/fold-toggle)
-         (t
-          #'evilmi-jump-items))))
+  (ignore-errors
+    (call-interactively
+     (cond ((eq major-mode 'magit-status-mode)
+            #'magit-section-toggle)
+           ((+evil-fold-p)
+            #'+evil/fold-toggle)
+           (t
+            #'evilmi-jump-items)))))
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index f45467b05..a3a229557 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -276,7 +276,8 @@ across windows."
   :commands (evilmi-jump-items evilmi-text-object global-evil-matchit-mode)
   :config (global-evil-matchit-mode 1)
   :init
-  (map! [remap evil-jump-item] #'evilmi-jump-items
+  (map! [remap evil-jump-item]    #'+evil/matchit
+        [remap evilmi-jump-items] #'+evil/matchit
         :textobj "%" #'evilmi-text-object #'evilmi-text-object)
   :config
   (defun +evil|simple-matchit ()