[elpa] 26/35: Should display the correct key now.

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit aa877f2a78cff001f295e0242a2884e835640a20
Author: Matthew L. Fidler <address@hidden>
Date:   Thu Jul 10 08:57:13 2014 -0500

    Should display the correct key now.
---
 ergoemacs-shortcuts.el |   30 +++++++++++++-----------------
 ergoemacs-themes.el    |    5 ++++-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index 513dc03..46efa81 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -440,17 +440,11 @@ It will replace anything defined by 
`ergoemacs-translation'"
     next-key))
 
 (declare-function ergoemacs-pretty-key "ergoemacs-translate.el")
-(defvar ergoemacs-alt-text
-  (replace-regexp-in-string
-   "[Qq]" "" (ergoemacs-pretty-key "M-q")))
+(defvar ergoemacs-alt-text "M-")
 
-(defvar ergoemacs-ctl-text
-  (replace-regexp-in-string
-   "[Qq]" "" (ergoemacs-pretty-key "C-q")))
+(defvar ergoemacs-ctl-text "C-")
 
-(defvar ergoemacs-alt-ctl-text
-  (replace-regexp-in-string
-   "[Qq]" "" (ergoemacs-pretty-key "C-q")))
+(defvar ergoemacs-alt-ctl-text "M-C-")
 
 (defun ergoemacs-read-key-next-key-is-alt (&optional type pretty-key)
   "The next key read is an Alt+ key. (or M- )"
@@ -479,14 +473,16 @@ It will replace anything defined by 
`ergoemacs-translation'"
 (defun ergoemacs-read-key-next-key-is-alt-ctl (&optional type pretty-key)
   "The next key read is an Alt+Ctrl+ key. (or C-M- )"
   (interactive)
-  (when (and type pretty-key)
-    (let* ((next-key (ergoemacs-translate
-                      (vector
-                       (ergoemacs-read-event nil pretty-key 
ergoemacs-alt-ctl-text))))
-           (key (plist-get next-key ':alt-ctl-key))
-           (pretty (plist-get next-key ':alt-ctl-pretty))
-           (kbd (plist-get next-key ':alt-ctl)))
-      (ergoemacs-read-key-install-next-key next-key key pretty kbd))))
+  (if (or type pretty-key)
+      (when (and type pretty-key)
+        (let* ((next-key (ergoemacs-translate
+                          (vector
+                           (ergoemacs-read-event nil pretty-key 
ergoemacs-alt-ctl-text))))
+               (key (plist-get next-key ':alt-ctl-key))
+               (pretty (plist-get next-key ':alt-ctl-pretty))
+               (kbd (plist-get next-key ':alt-ctl)))
+          (ergoemacs-read-key-install-next-key next-key key pretty kbd)))
+    (warn "This should be called from ergoemacs read key sequence only.")))
 
 (defun ergoemacs-read-key-next-key-is-quoted (&optional type pretty-key)
   "The next key read is quoted."
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index f5822a2..3214fbf 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -43,7 +43,10 @@
 
 (ergoemacs-theme-component standard-vars ()
   "Enabled/changed variables/modes"
-  (setq org-CUA-compatible t
+  (setq ergoemacs-alt-text (replace-regexp-in-string "[Qq]" "" 
(ergoemacs-pretty-key "M-q"))
+        ergoemacs-ctl-text (replace-regexp-in-string "[Qq]" "" 
(ergoemacs-pretty-key "C-q"))
+        ergoemacs-alt-ctl-text (replace-regexp-in-string "[Qq]" "" 
(ergoemacs-pretty-key "M-C-q"))
+        org-CUA-compatible t
         org-support-shift-select t
         set-mark-command-repeat-pop t
         org-special-ctrl-a/e t