From 6aa7be6d39845163f46c2f26c3a7365f679ba07a Mon Sep 17 00:00:00 2001 From: amirrezaask Date: Thu, 12 Mar 2020 21:02:22 +0330 Subject: [PATCH] resolve discussions --- lib/fg42/key-bindings.el | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/fg42/key-bindings.el b/lib/fg42/key-bindings.el index d57ec75..973aeab 100644 --- a/lib/fg42/key-bindings.el +++ b/lib/fg42/key-bindings.el @@ -37,32 +37,32 @@ (defun -defkey-evil (map state-keys fn) "Set the given STATE-KEYS on key map MAP to FN." - (let ( - (normal-key (plist-get state-keys :normal)) + (let ((normal-key (plist-get state-keys :normal)) (visual-key (plist-get state-keys :visual)) (insert-key (plist-get state-keys :insert)) (emacs-key (plist-get state-keys :emacs))) - (when (not (null normal-key)) (evil-define-key 'normal map (kbd normal-key) fn)) - (when (not (null visual-key)) (evil-define-key 'visual map (kbd visual-key) fn)) - (when (not (null insert-key)) (evil-define-key 'insert map (kbd insert-key) fn)) - (when (not (null emacs-key)) (evil-define-key 'emacs map (kbd emacs-key) fn)))) + (cond + ((not (null normal-key)) (evil-define-key 'normal map (kbd normal-key) fn)) + ((not (null visual-key)) (evil-define-key 'visual map (kbd visual-key) fn)) + ((not (null insert-key)) (evil-define-key 'insert map (kbd insert-key) fn)) + ((not (null emacs-key)) (evil-define-key 'emacs map (kbd emacs-key) fn))))) -(defmacro defkey (map keys fn) + +(defmacro defkey (map fn &rest keys) "Defines a key binding for FG42 for different types. Defines a keybinding in the given MAP for the given KEYS that maps to the given FN with the given DOCSTRING. -Example usage : (defkey `global-map` (:evil (:normal \"SPC s u\") :god \"C-x C-y\") counsel-M-x)" +Example usage : (defkey `'global-map`' 'counsel-M-x :evil (:normal \"SPC s u\") :god \"C-x C-n\")" (let ((god-key (plist-get keys :god)) (human-key (plist-get keys :human)) (evil-state-key (plist-get keys :evil))) (cond - ((is-god?) `(-defkey-god ,map ,god-key (quote ,fn))) - ((is-human?) `(-defkey-human ,map ,human-key (quote ,fn))) - ((is-evil?) `(-defkey-evil ,map (quote ,evil-state-key) (quote ,fn)))))) - + ((is-god?) `(-defkey-god ,map ,god-key ,fn)) + ((is-human?) `(-defkey-human ,map ,human-key ,fn)) + ((is-evil?) `(-defkey-evil ,map (quote ,evil-state-key) ,fn))))) (provide 'fg42/key-bindings) ;;; key-bindings.el ends here