let bind-key* override minor modes with emulation-mode-map-alists

diff --git a/lisp/use-package/bind-key.el b/lisp/use-package/bind-key.el
index 0d3039e5e011c63bbd866260fcb2bab817e8aaec..5d125199e704f7075cafca48df86e5cad38cd548 100644 (file)
--- a/lisp/use-package/bind-key.el
+++ b/lisp/use-package/bind-key.el
@@ -80,7 +80,12 @@
 
 (define-minor-mode override-global-mode
   "A minor mode so that keymap settings override other modes."
-  t "" override-global-map)
+  t "")
+
+;; the keymaps in `emulation-mode-map-alists' take precedence over
+;; `minor-mode-map-alist'
+(add-to-list 'emulation-mode-map-alists
+             `((override-global-mode . ,override-global-map)))
 
 (add-hook 'after-init-hook
           (function