[elpa] 93/117: Fix dired-mode-map changes by requiring dired

[Matthew Fidler]

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

commit b97693283b3c25b7377d14a86b4165e3e2197eae
Author: Matthew L. Fidler <address@hidden>
Date:   Wed Jul 23 08:47:19 2014 -0500

    Fix dired-mode-map changes by requiring dired
---
 ergoemacs-themes.el |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 1d6bd6f..c41aad5 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -31,9 +31,9 @@
   (require 'cl)
   (require 'ergoemacs-macros))
 
-(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)
+;; FIXME: Don't require, change maps on load...
+(require 'dired)
+(require 'wdired)
 (autoload 'isearch-ring-advance "isearch" nil t)
 (autoload 'isearch-ring-retreat "isearch" nil t)
 (autoload 'isearch-ring-toggle-regexp "isearch" nil t)
@@ -710,6 +710,11 @@
   (global-set-key (kbd "M-%") '(vr/query-replace query-replace-regexp))
 
   ;; Mode specific changes
+  (when dired-mode-hook 
+    :modify-map t
+    (define-key dired-mode-map (kbd "M-5") 'dired-do-query-replace-regexp)
+    (define-key dired-mode-map (kbd "M-%") 'dired-do-query-replace-regexp))
+
   (define-key browse-kill-ring-mode-map [remap isearch-forward] 
'browse-kill-ring-search-forward)
   (define-key browse-kill-ring-mode-map [remap isearch-backward] 
'browse-kill-ring-search-backward)
   :version 5.7.5