[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 91/117: Fix remaps to not use shortcuts
From: |
Matthew Fidler |
Subject: |
[elpa] 91/117: Fix remaps to not use shortcuts |
Date: |
Fri, 25 Jul 2014 13:24:30 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit d7174bd6a4fd0a810ca157bb748bddb37da8add7
Author: Matthew L. Fidler <address@hidden>
Date: Wed Jul 23 07:17:31 2014 -0500
Fix remaps to not use shortcuts
---
ergoemacs-theme-engine.el | 2 +-
ergoemacs-themes.el | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 9955944..cfe12ad 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -512,7 +512,7 @@ DEF is anything that can be a key's definition:
(push key-vect rm-keys)
(oset obj rm-keys rm-keys))
((and global-map-p (commandp def t)
- (not (string-match "\\(mouse\\|wheel\\)" (key-description key)))
+ (not (string-match "\\(mouse\\|wheel\\|remap\\)" key-desc))
(ergoemacs-shortcut-function-binding def))
;; This key could have some smart interpretations.
(ergoemacs-define-map--shortcut-list obj key-vect def)
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index e9041d2..1d6bd6f 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -718,9 +718,8 @@
(ergoemacs-theme-component search-reg ()
"Regular Expression Search/Replace"
- (when ergoemacs-mode ;; FIXME should work without when statement
- (global-set-key [remap isearch-forward] 'isearch-forward-regexp)
- (global-set-key [remap isearch-backward] 'isearch-backward-regexp))
+ (global-set-key [remap isearch-forward] 'isearch-forward-regexp)
+ (global-set-key [remap isearch-backward] 'isearch-backward-regexp)
(global-set-key (kbd "M-%") nil)
(global-set-key (kbd "M-5") '(vr/query-replace query-replace-regexp))
- [elpa] 68/117: Use remaps more, (continued)
- [elpa] 68/117: Use remaps more, Matthew Fidler, 2014/07/25
- [elpa] 81/117: Fix apps-toggle. Apparently the other method was mispecified, Matthew Fidler, 2014/07/25
- [elpa] 79/117: Allow repeated visual beginning/end of line, Matthew Fidler, 2014/07/25
- [elpa] 80/117: Dont flatten keymaps, Matthew Fidler, 2014/07/25
- [elpa] 82/117: Remove ergoemacs-mode from custom set vars, Matthew Fidler, 2014/07/25
- [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 <=
- [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, 2014/07/25
- [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