[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ergoemacs-mode f636ec3 155/325: Cleanup
From: |
Stefan Monnier |
Subject: |
[elpa] externals/ergoemacs-mode f636ec3 155/325: Cleanup |
Date: |
Sat, 23 Oct 2021 18:48:42 -0400 (EDT) |
branch: externals/ergoemacs-mode
commit f636ec333269de7371828daaad4b1e88d608c9d8
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>
Cleanup
---
ergoemacs-themes.el | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 827b5c8..5b6c1b6 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -66,7 +66,10 @@ will bind 'Meta-k' to next-line. If your layout is
'colemak', it will bind
)
(defun ergoemacs-unset-keys-in-map (local-map)
- "Unset all of the keys in a local map that we usually prefer to use the
ergoemacs keys."
+ "Unset all of the keys in a local map that we usually prefer to
+use the ergoemacs keys. This is only used for isearch-mode-map,
+since that is the only map that manages to evade being overridden
+by the emulation map."
(ergoemacs-define-key local-map (kbd "M-h") nil)
(ergoemacs-define-key local-map (kbd "M-H") nil)
@@ -141,8 +144,6 @@ will bind 'Meta-k' to next-line. If your layout is
'colemak', it will bind
(ergoemacs-define-key local-map (kbd "M-t") nil)
(ergoemacs-define-key local-map (kbd "M-T") nil)
(ergoemacs-define-key local-map (kbd "M-q") nil)
-
-
(define-key local-map (kbd "C-w") nil)
(define-key local-map (kbd "C-n") nil)
@@ -338,7 +339,6 @@ calling any other ergoemacs-set-* function"
;; These go into the global map, so they can be overridden by a
;; local mode map.
(global-set-key (kbd "C-f") 'isearch-forward)
- (define-key isearch-mode-map (kbd "C-f") 'isearch-repeat-forward)
(global-set-key (kbd "C-a") 'mark-whole-buffer)
(global-set-key (kbd "C-z") 'ergoemacs-undo)
@@ -360,8 +360,10 @@ calling any other ergoemacs-set-* function"
(global-set-key (kbd "C-S-o") 'ergoemacs-open-in-external-app)
(global-set-key (kbd "C-S-t") 'ergoemacs-open-last-closed)
-
- (define-key isearch-mode-map (kbd "C-v") 'ergoemacs-paste)
+
+ ;; These go into the isearch-mode-map, which supercedes all other
+ ;; maps when in isearch mode.
+ (define-key isearch-mode-map (kbd "C-f") 'isearch-repeat-forward)
)
(defun ergoemacs-set-help (keymap)
- [elpa] externals/ergoemacs-mode aafc9d9 119/325: Implement many standard-fixed bindings in a regular function, (continued)
- [elpa] externals/ergoemacs-mode aafc9d9 119/325: Implement many standard-fixed bindings in a regular function, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 3b10ca7 101/325: Remove ergoemacs-theme-set-version, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 7df49a1 123/325: Remove redundant tab-indents-region, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f4e9a52 104/325: Remove more ergoemacs-theme, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 6559fb9 103/325: Remove unused declaration, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 1fb7b06 132/325: Set most org-mode bindings in a proper function. Turn off some term mapping, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode fdb9e62 139/325: Remove some C- bindings. Make M-B variable. Fix conflicts in some local modes, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f76cc5e 147/325: Turn off pre-post command hooks and make term bindings work., Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 8c0e8f7 143/325: Fix beginning of line binding in eshell, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 3121362 144/325: Fix magit, message (and thus mu4e), and isearch, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode f636ec3 155/325: Cleanup,
Stefan Monnier <=
- [elpa] externals/ergoemacs-mode a4f5658 158/325: Delete some tests that are no longer designed to pass, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 676cd84 160/325: Fix infinite recursion in ergoemacs-compact-uncompact-block, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode fc90704 165/325: Remove some macros by getting rid of some remappings, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 915c65f 166/325: Remove more macros and a mysteriously failing test, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 9bf352f 168/325: Remove now unused macro option, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 9fbd66c 173/325: Mostly turn off advice, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 846931e 175/325: Put bindings M-SPC, -delete, -up, -down into the override map, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 3c06bbe 179/325: Remove some command-loop code, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode 9be4392 180/325: Remove lots of command-loop stuff, Stefan Monnier, 2021/10/23
- [elpa] externals/ergoemacs-mode d092102 181/325: Remove pre- and post-command hooks, Stefan Monnier, 2021/10/23