[elpa] 91/117: Fix remaps to not use shortcuts

[Matthew Fidler]

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

commit d7174bd6a4fd0a810ca157bb748bddb37da8add7
Author: Matthew L. Fidler <address@hidden>
Date:   Wed Jul 23 07:17:31 2014 -0500

    Fix remaps to not use shortcuts
---
 ergoemacs-theme-engine.el |    2 +-
 ergoemacs-themes.el       |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 9955944..cfe12ad 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -512,7 +512,7 @@ DEF is anything that can be a key's definition:
         (push key-vect rm-keys)
         (oset obj rm-keys rm-keys))
        ((and global-map-p (commandp def t)
-             (not (string-match "\\(mouse\\|wheel\\)" (key-description key)))
+             (not (string-match "\\(mouse\\|wheel\\|remap\\)" key-desc))
              (ergoemacs-shortcut-function-binding def))
         ;; This key could have some smart interpretations.
         (ergoemacs-define-map--shortcut-list obj key-vect def)
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index e9041d2..1d6bd6f 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -718,9 +718,8 @@
 
 (ergoemacs-theme-component search-reg ()
   "Regular Expression Search/Replace"
-  (when ergoemacs-mode ;; FIXME should work without when statement
-    (global-set-key [remap isearch-forward] 'isearch-forward-regexp)
-    (global-set-key [remap isearch-backward] 'isearch-backward-regexp))
+  (global-set-key [remap isearch-forward] 'isearch-forward-regexp)
+  (global-set-key [remap isearch-backward] 'isearch-backward-regexp)
 
   (global-set-key (kbd "M-%") nil)
   (global-set-key (kbd "M-5") '(vr/query-replace query-replace-regexp))