[elpa] 50/117: Add lookup of C-g to ergoemacs-keyboard-quit

[Matthew Fidler]

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

commit ca8a692de390960250e559c8bc51b8a7ff753dd6
Author: Matthew L. Fidler <address@hidden>
Date:   Thu Jul 17 08:18:58 2014 -0500

    Add lookup of C-g to ergoemacs-keyboard-quit
---
 ergoemacs-shortcuts.el |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index 6afc798..fbb3f26 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -547,6 +547,8 @@ It will replace anything defined by `ergoemacs-translation'"
 - `cua-mode' rectangle is active, clear the selected rectangle.
 - If the 【q】 key is bound to a non self-insert function, exit
   by this function. (By convention, the 【q】 key is often quit)
+- If the 【Ctrl+G】 key is bound to something other than
+  `keyboard-quit' use that. 
 - If `ergoemacs-mode' knows of the quit function, use that
 - If an `ergoemacs-mode' modal translation is active, deactivate it.
 - Otherwise issue `keyboard-quit'
@@ -564,7 +566,13 @@ It will replace anything defined by 
`ergoemacs-translation'"
                  (setq tmp (key-binding "q"))
                  (and (not (symbolp tmp)) (commandp tmp t)))
                (not (string-match "self-insert" (symbol-name tmp)))))
-      (call-interactively (key-binding "q")))
+      (call-interactively tmp))
+     ((and (not (region-active-p))
+           (or (progn
+                 (setq tmp (key-binding "C-g"))
+                 (and (not (symbolp tmp)) (commandp tmp t)))
+               (not (eq 'keyboard-quit tmp))))
+      (call-interactively tmp))
      (t
       (let (defined-fn
              ergoemacs-shortcut-keys