-(defun mdw-clobber-org-mode-map ()
- (dolist (key '([S-up] [S-down] [S-left] [S-right]
- [?\e left] [?\e right]
- [M-left] [M-right]))
- (define-key org-mode-map key nil))
- (define-key org-mode-map [?\C-c left] 'org-shiftleft)
- (define-key org-mode-map [?\C-c right] 'org-shiftright)
- (define-key org-mode-map [?\C-c up] 'org-shiftup)
- (define-key org-mode-map [?\C-c down] 'org-shiftdown)
- (define-key org-mode-map [C-left] 'org-metaleft)
- (define-key org-mode-map [C-right] 'org-metaright)
- (define-key org-mode-map [C-up] 'org-metaup)
- (define-key org-mode-map [C-down] 'org-metadown))
-(add-hook 'org-mode-hook 'mdw-clobber-org-mode-map)
+(add-hook 'org-mode-hook
+ #'(lambda () (mdw-clobber-evil-keymap org-mode-map)))
+(add-hook 'org-agenda-mode-hook
+ #'(lambda () (mdw-clobber-evil-keymap org-agenda-mode-map)))