mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 363cd9831a93018a25423fbe384a27de0243a999 Author: Matthew L. Fidler <[email protected]> Date: Fri May 23 22:28:10 2014 +0800 Use strinp consp and vectorp --- ergoemacs-shortcuts.el | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el index 12b7227..96c4d5d 100644 --- a/ergoemacs-shortcuts.el +++ b/ergoemacs-shortcuts.el @@ -49,7 +49,10 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;; Code: -(require 'guide-key nil t) +;; (require 'guide-key nil t) + +(unless (fboundp 'ergoemacs-pretty-key) + (require 'ergoemacs-translate)) (defmacro ergoemacs-with-ergoemacs (&rest body) "With basic `ergoemacs-mode' mode keys. @@ -173,11 +176,11 @@ This sequence is compatible with `listify-key-sequence'." (let (input) (cond ((not key)) ;; Not specified. - ((eq (type-of key) 'vector) ;; Actual key sequence + ((vectorp key) ;; Actual key sequence (setq input (listify-key-sequence key))) - ((eq (type-of key) 'cons) ;; Listified key sequence + ((consp key) ;; Listified key sequence (setq input key)) - ((eq (type-of key) 'string) ;; Kbd code + ((stringp key) ;; Kbd code (setq input (listify-key-sequence (read-kbd-macro key t))))) input))
