[elpa] 166/287: Misc cleanups

[Matthew Fidler]

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

commit 717d87448339ec9586cf2a41dee86bdad77e024c
Author: Matthew L. Fidler <address@hidden>
Date:   Thu Jun 19 07:26:17 2014 -0500

    Misc cleanups
---
 ergoemacs-macros.el |    2 +-
 ergoemacs-mode.el   |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 9aacc49..26bfd96 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -344,7 +344,7 @@ DIFFERENCES are the differences from the layout based on 
the functions.  These a
       ((and (<= 24 emacs-major-version)
             (<= 4 emacs-minor-version))
        'eieio-object-set-name-string)
-      (t 'object-set-name-string)) ,obj ,string))
+      (t 'object-set-name-string)) ,obj ,name))
 (provide 'ergoemacs-macros)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; ergoemacs-macros.el ends here
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 0b3fcd9..63c878d 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -526,7 +526,6 @@ bindings the keymap is:
             (cua--rectangle . ,cua--rectangle-keymap)
             (cua--ena-region-keymap . ,cua--region-keymap)
             (cua-mode . ,cua-global-keymap)))
-    (remove-hook 'minibuffer-setup-hook #'ergoemacs-minibuffer-setup)
     (remove-hook 'pre-command-hook 'ergoemacs-pre-command-hook)
     (ergoemacs-populate-pre-command-hook t)
     ;; Revert `substitute-command-keys' and `completing-read'