[elpa] 69/117: Fix Issue #279

[Matthew Fidler]

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

commit c1ef5956ff1e51265a6ec70095ede8bd07e29aae
Author: Matthew L. Fidler <address@hidden>
Date:   Fri Jul 18 10:47:04 2014 -0500

    Fix Issue #279
---
 ergoemacs-theme-engine.el |    7 +++----
 ergoemacs-themes.el       |    3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 2ae3f71..8fa4672 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -1563,12 +1563,11 @@ If it is not a composed KEYMAP, return the keymap as 
is."
                     ;; (push (make-sparse-keymap "ergoemacs-modified") n-map)
                     )
                    (t
+                    (setq n-map (list n-map))
                     ;; (setq n-map (list (make-sparse-keymap 
"ergoemacs-modified") n-map))
                     ))
-                  (setq n-map (copy-keymap
-                               (make-composed-keymap
-                                n-map
-                                o-map)))
+                  (push map n-map)
+                  (setq n-map (copy-keymap (make-composed-keymap n-map o-map)))
                   (define-key n-map [ergoemacs] 'ignore)
                   (set map-name n-map)))
                (t ;; Maps that are not modified.
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index ea6e937..752db14 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -34,6 +34,9 @@
 (autoload 'dired-jump "dired-x" "ergoemacs-autoload." t)
 (autoload 'wdired-change-to-wdired-mode "wdired" "ergoemacs-autoload." t)
 (autoload 'wdired-exit "wdired" "ergoemacs-autoload." t)
+(autoload 'isearch-ring-advance "isearch" nil t)
+(autoload 'isearch-ring-retreat "isearch" nil t)
+(autoload 'isearch-ring-toggle-regexp "isearch" nil t)
 
 
 (require 'advice)