[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 220/287: Partial Fix for Issue #243
From: |
Matthew Fidler |
Subject: |
[elpa] 220/287: Partial Fix for Issue #243 |
Date: |
Wed, 02 Jul 2014 14:46:09 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit cfc1c4884dbec6e894212598a71c2a826ddf7ae3
Author: Matthew L. Fidler <address@hidden>
Date: Thu Jun 26 08:10:50 2014 -0500
Partial Fix for Issue #243
---
ergoemacs-shortcuts.el | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index 5646bef..21036aa 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -1185,13 +1185,20 @@ argument prompt.
(setq ergoemacs-deactivate-mark deactivate-mark)
(cond
((eq local-fn 'keymap)
- (when real-read
- (push (list type
- (listify-key-sequence key))
- history))
- (setq continue-read t
- key key-trial
- pretty-key pretty-key-trial)
+ ;; Test to see if major/minor modes have an
+ ;; override for this keymap, see Issue 243.
+ (let ((new-fn (and key
(ergoemacs-with-major-and-minor-modes (ergoemacs-real-key-binding key-trial)))))
+ (if (ignore-errors (commandp new-fn t))
+ (progn
+ (setq local-fn 'major-minor-override-fn)
+ (ergoemacs-read-key-call new-fn nil key))
+ (when real-read
+ (push (list type
+ (listify-key-sequence key))
+ history))
+ (setq continue-read t
+ key key-trial
+ pretty-key pretty-key-trial)))
;; Found, exit
(throw 'ergoemacs-key-trials t))
((eq (type-of local-fn) 'cons)
- [elpa] 209/287: Declare ergoemacs-use-M-x-p, (continued)
- [elpa] 209/287: Declare ergoemacs-use-M-x-p, Matthew Fidler, 2014/07/02
- [elpa] 210/287: Test Issue #243. C-c C-c M-x vs C-c C-c., Matthew Fidler, 2014/07/02
- [elpa] 211/287: Add send outlook files to emacs, Matthew Fidler, 2014/07/02
- [elpa] 213/287: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode, Matthew Fidler, 2014/07/02
- [elpa] 215/287: Merge pull request #245 from bmalehorn/programmer-dv, Matthew Fidler, 2014/07/02
- [elpa] 214/287: fix incorrect ergoemacs-layout-programmer-dv, Matthew Fidler, 2014/07/02
- [elpa] 212/287: modified ergoemacs-cut-all so it doesn't join previous cut., Matthew Fidler, 2014/07/02
- [elpa] 216/287: Drop FIXME, Matthew Fidler, 2014/07/02
- [elpa] 223/287: Remove archive-mode and ses-mode from menus. Issue #246., Matthew Fidler, 2014/07/02
- [elpa] 217/287: Fix image generation and autohotkey generation, Matthew Fidler, 2014/07/02
- [elpa] 220/287: Partial Fix for Issue #243,
Matthew Fidler <=
- [elpa] 222/287: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode, Matthew Fidler, 2014/07/02
- [elpa] 221/287: Be more careful with links. Issue #247, Matthew Fidler, 2014/07/02
- [elpa] 225/287: Added disabling to redo based on undo-tree-mode, Matthew Fidler, 2014/07/02
- [elpa] 218/287: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode, Matthew Fidler, 2014/07/02
- [elpa] 231/287: Change layout descriptions, Matthew Fidler, 2014/07/02
- [elpa] 229/287: Fix order of operations, Matthew Fidler, 2014/07/02
- [elpa] 226/287: Remove default redo keys; Possibly Fix Issue #242, Matthew Fidler, 2014/07/02
- [elpa] 224/287: Make undo-tree the default undo method and installed when ergoemacs-mode is installed. Issue #242, Matthew Fidler, 2014/07/02
- [elpa] 228/287: Add `cua-rect` require so that tests pass, Matthew Fidler, 2014/07/02
- [elpa] 219/287: `ergoemacs-select-text-in-quote' can now deal with escaped quote in string., Matthew Fidler, 2014/07/02