[elpa] 55/117: Bug fix for ergoemacs-keyboard-quit

[Matthew Fidler]

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

commit 0be3cfa7fb52f9bf2d04976d8f1ac7b95b5e27b6
Author: Matthew L. Fidler <address@hidden>
Date:   Thu Jul 17 14:27:36 2014 -0500

    Bug fix for ergoemacs-keyboard-quit
---
 ergoemacs-shortcuts.el |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index fbb3f26..974fa15 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -562,16 +562,16 @@ It will replace anything defined by 
`ergoemacs-translation'"
            (fboundp 'cua-clear-rectangle-mark))
       (cua-clear-rectangle-mark))
      ((and (not (region-active-p))
-           (or (progn
-                 (setq tmp (key-binding "q"))
-                 (and (not (symbolp tmp)) (commandp tmp t)))
+           (and (progn
+                  (setq tmp (key-binding "q"))
+                  (commandp tmp t))
                (not (string-match "self-insert" (symbol-name tmp)))))
       (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))))
+           (and (progn
+                  (setq tmp (key-binding "C-g"))
+                  (commandp tmp t))
+                (not (eq 'keyboard-quit tmp))))
       (call-interactively tmp))
      (t
       (let (defined-fn