Abstract kbd function/macro

This is no meaning on 24.3 or higher Emacs and still old Emacs can not use mykie.
yuutayamada · Feb 9, 2015 · fe1c92e · fe1c92e
1 parent 23a0212
commit fe1c92e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lisp/mykie.el b/lisp/mykie.el
@@ -632,10 +632,18 @@ Otherwise return KW-AND-CONDITION's first element."
       (before (run-hooks 'mykie:region-before-init-hook))
       (after  (run-hooks 'mykie:region-after-init-hook)))))
 
+(defun mykie:kbd (key)
+  (kbd key))
+
+;; TODO: Fix this to work around in old version Emacs
+(when (version< emacs-version "24.3")
+  (defadvice mykie:kbd (around macro->function activate)
+    (setq ad-return-value (apply (macroexpand (list 'kbd (ad-get-arg 0)))))))
+
 (defun mykie:format-key (key)
   (cl-typecase key
     (vector key)
-    (string (kbd key))
+    (string (mykie:kbd key))
     (t (error "Invalid key"))))
 
 (defmacro mykie:define-key (keymap key &rest args)

diff --git a/test/test-helper.el b/test/test-helper.el
@@ -16,7 +16,7 @@
   (with-temp-buffer
     (test-init expect)
     (when test-region-state (set-mark (point)))
-    (call-interactively (lookup-key map (kbd key)))
+    (call-interactively (lookup-key map (mykie:kbd key)))
     (case expect
       (readonly (toggle-read-only 0))
       ((url C-u&url)     (should (equal test-url  mykie:current-thing)))