Merge pull request #521 from ergoemacs/502-ergoemacs-in-terminal-mode-breaks-keybingings-for-arrows-functional-keys

502 ergoemacs in terminal mode breaks keybingings for arrows functional keys

Author: mattfidler

ergoemacs-mode.el

@@ -10,7 +10,7 @@
 ;; Created: August 01 2007
 ;; Keywords: convenience
 ;; Version: 5.16.10.12
-;; Package-Requires: ((emacs "24.1") (cl-lib "0.5") (nadvice "0.1"))
+;; Package-Requires: ((emacs "24.1") (cl-lib "0.5") (nadvice "0.4"))
 ;; URL: https://github.com/ergoemacs/ergoemacs-mode
 
 ;; ErgoEmacs is free software: you can redistribute it and/or modify
@@ -471,16 +471,14 @@ after initializing ergoemacs-mode.
           (ergoemacs-mode-regular . ,ergoemacs-keymap)
           (ergoemacs-mode-send-emacs-keys . ,ergoemacs--send-emacs-keys-map)))
   (add-hook 'emulation-mode-map-alists ergoemacs-override-alist)
-  (when (version<= "24.4" emacs-version)
-    (advice-add 'undefined :around #'ergoemacs-advice-undefined)
-    (advice-add 'read-key :around #'ergoemacs-read-key)))
+  (advice-add 'undefined :around #'ergoemacs-advice-undefined)
+  (advice-add 'read-key :around #'ergoemacs-read-key))
 
 (defun ergoemacs-remove-override-keymap ()
   "Remove `ergoemacs-mode' keymaps."
   (remove-hook 'emulation-mode-map-alists 'ergoemacs-override-alist)
-  (when (version<= "24.4" emacs-version)
-    (advice-remove 'undefined #'ergoemacs-advice-undefined)
-    (advice-remove 'read-key #'ergoemacs-read-key)))
+  (advice-remove 'undefined #'ergoemacs-advice-undefined)
+  (advice-remove 'read-key #'ergoemacs-read-key))
 
 
 ;;; Frequently used commands as aliases

ergoemacs-themes.el

@@ -1222,10 +1222,9 @@ In a terminal, this can be either arrow keys (e.g. meta+O A == <up>) or regular
 (defun ergoemacs-fix-arrow-keys (keymap)
   "Fix arrow keys for KEYMAP."
   (let (ergoemacs-M-O-binding)
-    (when ergoemacs-M-O-binding
-      (setq ergoemacs-M-O-binding (lookup-key keymap (kbd "M-O")))
-      (define-key keymap (kbd "M-O") 'ergoemacs-handle-M-O)
-      (define-key keymap [ergoemacs-meta-O] ergoemacs-M-O-binding))))
+    (setq ergoemacs-M-O-binding (lookup-key keymap (kbd "M-O")))
+    (define-key keymap (kbd "M-O") 'ergoemacs-handle-M-O)
+    (define-key keymap [ergoemacs-meta-O] ergoemacs-M-O-binding)))
 
 (defvar ergoemacs-override-keymap)