[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 93/117: Fix dired-mode-map changes by requiring dired
From: |
Matthew Fidler |
Subject: |
[elpa] 93/117: Fix dired-mode-map changes by requiring dired |
Date: |
Fri, 25 Jul 2014 13:24:31 +0000 |
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
- [elpa] 86/117: Clear local ergoemacs-mode read-key captures, (continued)
- [elpa] 86/117: Clear local ergoemacs-mode read-key captures, Matthew Fidler, 2014/07/25
- [elpa] 85/117: Fix cut and copy issues, Matthew Fidler, 2014/07/25
- [elpa] 83/117: Handle menu-bar when flattening keymaps., Matthew Fidler, 2014/07/25
- [elpa] 88/117: Add non-defined functions to map, Matthew Fidler, 2014/07/25
- [elpa] 89/117: Fix byte compile warning, Matthew Fidler, 2014/07/25
- [elpa] 91/117: Fix remaps to not use shortcuts, Matthew Fidler, 2014/07/25
- [elpa] 92/117: Remove local read-key reset; Shouldn't be needed, Matthew Fidler, 2014/07/25
- [elpa] 90/117: Hack to make search-reg work. Should work normally :(, Matthew Fidler, 2014/07/25
- [elpa] 95/117: No need to create autoloads any longer, Matthew Fidler, 2014/07/25
- [elpa] 84/117: Flatten keymaps, Matthew Fidler, 2014/07/25
- [elpa] 93/117: Fix dired-mode-map changes by requiring dired,
Matthew Fidler <=
- [elpa] 96/117: Add back dired-jump, Matthew Fidler, 2014/07/25
- [elpa] 87/117: Handle the (keymap (keymap ...)) composed keymap, Matthew Fidler, 2014/07/25
- [elpa] 97/117: Move wdired-exit to ergoemacs-keyboard-quit, Matthew Fidler, 2014/07/25
- [elpa] 94/117: Apply deferred keys., Matthew Fidler, 2014/07/25
- [elpa] 99/117: Don't save so much. Just save once., Matthew Fidler, 2014/07/25
- [elpa] 100/117: Do not reset ergoemacs-command-shortcuts-hash, Matthew Fidler, 2014/07/25
- [elpa] 101/117: Add DEL as known key binding, Matthew Fidler, 2014/07/25
- [elpa] 102/117: Tell user that the global keys are overriding ergoemacs-keys, Matthew Fidler, 2014/07/25
- [elpa] 103/117: Only complain when initially changing the key, Matthew Fidler, 2014/07/25
- [elpa] 98/117: Don't remove things from the shortcut hash, Matthew Fidler, 2014/07/25