From b337c581c607307b0c64cab5e530a6ec3202e293 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 15 Oct 2017 12:37:33 +0100 Subject: [PATCH] Evil: Work around PDF bindings overriding Image bindings --- .emacs.d/lisp/init-evil.el | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.emacs.d/lisp/init-evil.el b/.emacs.d/lisp/init-evil.el index 7f6be20f..9c80a85f 100644 --- a/.emacs.d/lisp/init-evil.el +++ b/.emacs.d/lisp/init-evil.el @@ -219,12 +219,16 @@ (with-eval-after-load 'outline (require 'init-evil-outline)) -;;; TODO: `image-mode-map' is the parent of `pdf-view-mode-map'. A bug(?) in -;;; Evil overrides all image-mode-map bindings. -;;; See https://github.com/emacs-evil/evil/issues/938. -(with-eval-after-load 'pdf-view (require 'init-evil-pdf)) (with-eval-after-load 'image-mode (require 'init-evil-image)) +(with-eval-after-load 'pdf-view + (require 'init-evil-pdf) + ;; TODO: `image-mode-map' is the parent of `pdf-view-mode-map'. A bug(?) in + ;; Evil overrides all image-mode-map bindings. + ;; See https://github.com/emacs-evil/evil/issues/938. + ;; A workaround is to re-load the image bindings after PDF bindings are set. + (load-library "init-evil-image")) + (with-eval-after-load 'term (require 'init-evil-term)) (with-eval-after-load 'ztree-diff (require 'init-evil-ztree))