[elpa] 15/117: Don't exit if region is active.

[Matthew Fidler]

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

commit 811f904b76228eb350b693ef723feeb60e814ccc
Author: Matthew L. Fidler <address@hidden>
Date:   Mon Jul 14 15:11:13 2014 -0500

    Don't exit if region is active.
---
 ergoemacs-shortcuts.el |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index 4a4be25..e9e5964 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -529,10 +529,11 @@ It will replace anything defined by 
`ergoemacs-translation'"
            (boundp 'cua-mode) cua-mode
            (fboundp 'cua-clear-rectangle-mark))
       (cua-clear-rectangle-mark))
-     ((or (progn
-            (setq tmp (key-binding "q"))
-            (and (not (symbolp tmp)) (commandp tmp t)))
-          (not (string-match "self-insert" (symbol-name tmp))))
+     ((and (not (region-active-p))
+           (or (progn
+                 (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")))
      (t
       (let (defined-fn