From 1bc80a16cb6b12034aabb167852be1d4d279ac10 Mon Sep 17 00:00:00 2001
From: Eivind Fonn <evfonn@gmail.com>
Date: Sat, 28 Dec 2019 11:41:26 +0100
Subject: [PATCH 1/3] Search highlights: check window liveness

---
 evil-search.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/evil-search.el b/evil-search.el
index 4599cba1..d3aefa21 100644
--- a/evil-search.el
+++ b/evil-search.el
@@ -604,12 +604,13 @@ The following properties are supported:
                                  'all-windows)
                              (get-buffer-window-list (current-buffer) nil t)
                            (list (evil-ex-hl-window hl))))
-              (let ((beg (max (window-start win)
-                              (or (evil-ex-hl-min hl) (point-min))))
-                    (end (min (window-end win)
-                              (or (evil-ex-hl-max hl) (point-max)))))
-                (when (< beg end)
-                  (push (cons beg end) ranges))))
+              (when (window-live-p win)
+                (let ((beg (max (window-start win)
+                                (or (evil-ex-hl-min hl) (point-min))))
+                      (end (min (window-end win)
+                                (or (evil-ex-hl-max hl) (point-max)))))
+                  (when (< beg end)
+                    (push (cons beg end) ranges)))))
             (setq ranges
                   (sort ranges #'(lambda (r1 r2) (< (car r1) (car r2)))))
             (while ranges

From 28a0625e6eca74e4a611df89f6ddd379c4c8111d Mon Sep 17 00:00:00 2001
From: Miciah Masters <miciah.masters@gmail.com>
Date: Sun, 12 Jan 2020 15:19:21 -0500
Subject: [PATCH 2/3] Preserve the tab-bar in `evil-read-key'

When setting a new global map, the tab-bar entry must be copied to the new
map from the old one to avoid hiding the tab bar.

* evil-common.el (evil-read-key): Preserve the tab-bar entry from the old
global map.
---
 evil-common.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/evil-common.el b/evil-common.el
index 5991ee33..de34a5c9 100644
--- a/evil-common.el
+++ b/evil-common.el
@@ -555,6 +555,8 @@ Translates it according to the input method."
             (progn
               (define-key new-global-map [menu-bar]
                 (lookup-key global-map [menu-bar]))
+              (define-key new-global-map [tab-bar]
+                (lookup-key global-map [tab-bar]))
               (define-key new-global-map [tool-bar]
                 (lookup-key global-map [tool-bar]))
               (add-to-list 'new-global-map

From 0140a232474581e4aecc3c5bba4cf49a76f87a5d Mon Sep 17 00:00:00 2001
From: Eivind Fonn <evfonn@gmail.com>
Date: Mon, 13 Jan 2020 10:12:02 +0100
Subject: [PATCH 3/3] Bump version to 1.12.17

---
 Cask                   | 2 +-
 evil-command-window.el | 2 +-
 evil-commands.el       | 2 +-
 evil-common.el         | 2 +-
 evil-core.el           | 2 +-
 evil-development.el    | 2 +-
 evil-digraphs.el       | 2 +-
 evil-ex.el             | 2 +-
 evil-integration.el    | 2 +-
 evil-jumps.el          | 2 +-
 evil-keybindings.el    | 2 +-
 evil-macros.el         | 2 +-
 evil-maps.el           | 2 +-
 evil-pkg.el            | 2 +-
 evil-repeat.el         | 2 +-
 evil-search.el         | 2 +-
 evil-states.el         | 2 +-
 evil-test-helpers.el   | 4 ++--
 evil-tests.el          | 2 +-
 evil-types.el          | 2 +-
 evil-vars.el           | 4 ++--
 evil.el                | 2 +-
 22 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Cask b/Cask
index 869e3f0e..1ba41966 100644
--- a/Cask
+++ b/Cask
@@ -1,4 +1,4 @@
-(package "evil" "1.12.16" "Extensible Vi layer for Emacs.")
+(package "evil" "1.12.17" "Extensible Vi layer for Emacs.")
 
 (files "*.el")
 
diff --git a/evil-command-window.el b/evil-command-window.el
index d7657214..81e85268 100644
--- a/evil-command-window.el
+++ b/evil-command-window.el
@@ -2,7 +2,7 @@
 ;; Author: Emanuel Evans <emanuel.evans at gmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-commands.el b/evil-commands.el
index 8f205108..5138dd7a 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -2,7 +2,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-common.el b/evil-common.el
index de34a5c9..aca66f76 100644
--- a/evil-common.el
+++ b/evil-common.el
@@ -2,7 +2,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-core.el b/evil-core.el
index 618e09a2..ca5cda6f 100644
--- a/evil-core.el
+++ b/evil-core.el
@@ -2,7 +2,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-development.el b/evil-development.el
index a048b31a..4952e614 100644
--- a/evil-development.el
+++ b/evil-development.el
@@ -2,7 +2,7 @@
 
 ;; Author: Justin Burkett <justin at burkett dot cc>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-digraphs.el b/evil-digraphs.el
index f07c2bc9..1d311466 100644
--- a/evil-digraphs.el
+++ b/evil-digraphs.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-ex.el b/evil-ex.el
index a1791ce9..04ed6509 100644
--- a/evil-ex.el
+++ b/evil-ex.el
@@ -3,7 +3,7 @@
 ;; Author: Frank Fischer <frank fischer at mathematik.tu-chemnitz.de>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-integration.el b/evil-integration.el
index a7789294..73fbd727 100644
--- a/evil-integration.el
+++ b/evil-integration.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-jumps.el b/evil-jumps.el
index 2ef47144..e03989cb 100644
--- a/evil-jumps.el
+++ b/evil-jumps.el
@@ -2,7 +2,7 @@
 
 ;; Author: Bailey Ling <bling at live.ca>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-keybindings.el b/evil-keybindings.el
index e519f993..20a418c9 100644
--- a/evil-keybindings.el
+++ b/evil-keybindings.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-macros.el b/evil-macros.el
index 2f04de31..e5764736 100644
--- a/evil-macros.el
+++ b/evil-macros.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-maps.el b/evil-maps.el
index c6cca6b6..c24623dc 100644
--- a/evil-maps.el
+++ b/evil-maps.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-pkg.el b/evil-pkg.el
index e5af9507..22c9e988 100644
--- a/evil-pkg.el
+++ b/evil-pkg.el
@@ -1,6 +1,6 @@
 (define-package
   "evil"
-  "1.12.16"
+  "1.12.17"
   "Extensible Vi layer for Emacs."
   '((emacs "24.1")
     (undo-tree "0.6.3")
diff --git a/evil-repeat.el b/evil-repeat.el
index 6264fd86..06f76636 100644
--- a/evil-repeat.el
+++ b/evil-repeat.el
@@ -3,7 +3,7 @@
 ;; Author: Frank Fischer <frank.fischer at mathematik.tu-chemnitz.de>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-search.el b/evil-search.el
index d3aefa21..8569e001 100644
--- a/evil-search.el
+++ b/evil-search.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-states.el b/evil-states.el
index e78d8ab1..2198c041 100644
--- a/evil-states.el
+++ b/evil-states.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-test-helpers.el b/evil-test-helpers.el
index ecbb62cb..4549b1f1 100644
--- a/evil-test-helpers.el
+++ b/evil-test-helpers.el
@@ -2,8 +2,8 @@
 
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
-;; Package-Requires: ((evil "1.12.16"))
-;; Version: 1.12.16
+;; Package-Requires: ((evil "1.12.17"))
+;; Version: 1.12.17
 
 ;; This file is NOT part of GNU Emacs.
 
diff --git a/evil-tests.el b/evil-tests.el
index e82f3451..38a7d4da 100644
--- a/evil-tests.el
+++ b/evil-tests.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-types.el b/evil-types.el
index 094323a9..7037f3f4 100644
--- a/evil-types.el
+++ b/evil-types.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
diff --git a/evil-vars.el b/evil-vars.el
index 4c729b52..6850ed39 100644
--- a/evil-vars.el
+++ b/evil-vars.el
@@ -3,7 +3,7 @@
 ;; Author: Vegard Øye <vegard_oye at hotmail.com>
 ;; Maintainer: Vegard Øye <vegard_oye at hotmail.com>
 
-;; Version: 1.12.16
+;; Version: 1.12.17
 
 ;;
 ;; This file is NOT part of GNU Emacs.
@@ -1875,7 +1875,7 @@ Otherwise the previous command is assumed as substitute.")
                       (buffer-substring (point-min)
                                         (line-end-position))))
           ;; no repo, use plain version
-          "1.12.16"))))
+          "1.12.17"))))
   "The current version of Evil")
 
 (defcustom evil-want-integration t
diff --git a/evil.el b/evil.el
index e3b52857..b81f1848 100644
--- a/evil.el
+++ b/evil.el
@@ -55,7 +55,7 @@
 ;;      To get in touch, please use the bug tracker or the
 ;;      mailing list (see below).
 ;; Created: 2011-03-01
-;; Version: 1.12.16
+;; Version: 1.12.17
 ;; Keywords: emulation, vim
 ;; URL: https://github.com/emacs-evil/evil
 ;;      Repository: https://github.com/emacs-evil/evil.git