X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=emacs.d%2Femacs-evil.org;h=2923d5e898487de20165b2fc21fd38ef51ba859d;hb=5456b174d287b33de766c91df9eee27a0993d241;hp=294ce4d246b697579a34f91718dca79ad5213ffd;hpb=27a400783a99d1fbaf067c172e39044efde09f5d;p=dotfiles.git

diff --git a/emacs.d/emacs-evil.org b/emacs.d/emacs-evil.org
index 294ce4d..2923d5e 100644
--- a/emacs.d/emacs-evil.org
+++ b/emacs.d/emacs-evil.org
@@ -196,12 +196,17 @@ Let the search highlight persistent, https://stackoverflow.com/questions/2576803
 ** Eshell
 #+BEGIN_SRC emacs-lisp :tangle yes :results silent
   (add-hook 'eshell-mode-hook (lambda ()
-                                (dolist (key-fun '(("e" . sd/toggle-project-eshell)
-                                                   ("d" . dired)
-                                                   ("f" . ido-switch-buffer)
-                                                   ("q" . evil-quit)))
-                                  (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader (car key-fun))) (cdr key-fun)))))
+                                (when (and (boundp 'evil-mode) evil-mode)
+                                  (dolist (key-fun '(("e" . sd/toggle-project-eshell)
+                                                     ("d" . dired)
+                                                     ("f" . ido-switch-buffer)
+                                                     ("'" . other-window)
+                                                     ("q" . evil-quit)))
+                                    (evil-define-key 'emacs eshell-mode-map (kbd (concat evil-leader/leader (car key-fun))) (cdr key-fun))))
+                                ;; (define-key eshell-mode-map (kbd "C-j") nil)
+                                ))
 
+  ;; 
   ;; (add-hook 'eshell-mode-map
   ;;        (lambda ()
   ;;          (mapc (lambda (key-fun)