[elpa] 207/287: Fix ergoemacs-pushnew Issue #244.

[Matthew Fidler]

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

commit abda1690e199af29b851ee54f2359a0e3b732d72
Author: Matthew L. Fidler <address@hidden>
Date:   Tue Jun 24 07:11:16 2014 -0500

    Fix ergoemacs-pushnew Issue #244.
---
 ergoemacs-macros.el       |    1 +
 ergoemacs-theme-engine.el |    2 +-
 ergoemacs-unbind.el       |    9 ++++++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index c1d8d06..a1eeb88 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -378,6 +378,7 @@ DIFFERENCES are the differences from the layout based on 
the functions.  These a
        'eieio-object-set-name-string)
       (t 'object-set-name-string)) ,obj ,name))
 
+;;;###autoload
 (defmacro ergoemacs-pushnew (x place &rest plist)
   "Fix byte-compile errors for emacs versions less than 24.3.
 It says that `adjoin' from `cl' may be called at runtime, so use
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 15c86d9..f7e4daf 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -1861,7 +1861,7 @@ DONT-COLLAPSE doesn't collapse empty keymaps"
           (when (and (or (commandp lk t)
                          (keymapp lk))
                      (not (member key '([remap] ))))
-            (pushnew key ergoemacs-global-override-rm-keys
+            (ergoemacs-pushnew key ergoemacs-global-override-rm-keys
                      :test 'equal)
             (throw 'found-global-command t)))
         (setq key (substring key 0 (- (length key) 1)))))))
diff --git a/ergoemacs-unbind.el b/ergoemacs-unbind.el
index b8a9f9f..a1d041d 100644
--- a/ergoemacs-unbind.el
+++ b/ergoemacs-unbind.el
@@ -28,7 +28,14 @@
 ;; 
 
 ;;; Code:
-
+(eval-when-compile 
+  (require 'cl)
+  (require 'ergoemacs-macros 
+           (expand-file-name "ergoemacs-macros" 
+                             (file-name-directory (or
+                                                   load-file-name
+                                                   (buffer-file-name)
+                                                   default-directory)))))
 (require 'edmacro)
 
 (defvar ergoemacs-emacs-default-bindings