[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 50/117: Add lookup of C-g to ergoemacs-keyboard-quit
From: |
Matthew Fidler |
Subject: |
[elpa] 50/117: Add lookup of C-g to ergoemacs-keyboard-quit |
Date: |
Fri, 25 Jul 2014 13:24:10 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit ca8a692de390960250e559c8bc51b8a7ff753dd6
Author: Matthew L. Fidler <address@hidden>
Date: Thu Jul 17 08:18:58 2014 -0500
Add lookup of C-g to ergoemacs-keyboard-quit
---
ergoemacs-shortcuts.el | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ergoemacs-shortcuts.el b/ergoemacs-shortcuts.el
index 6afc798..fbb3f26 100644
--- a/ergoemacs-shortcuts.el
+++ b/ergoemacs-shortcuts.el
@@ -547,6 +547,8 @@ It will replace anything defined by `ergoemacs-translation'"
- `cua-mode' rectangle is active, clear the selected rectangle.
- If the 【q】 key is bound to a non self-insert function, exit
by this function. (By convention, the 【q】 key is often quit)
+- If the 【Ctrl+G】 key is bound to something other than
+ `keyboard-quit' use that.
- If `ergoemacs-mode' knows of the quit function, use that
- If an `ergoemacs-mode' modal translation is active, deactivate it.
- Otherwise issue `keyboard-quit'
@@ -564,7 +566,13 @@ It will replace anything defined by
`ergoemacs-translation'"
(setq tmp (key-binding "q"))
(and (not (symbolp tmp)) (commandp tmp t)))
(not (string-match "self-insert" (symbol-name tmp)))))
- (call-interactively (key-binding "q")))
+ (call-interactively tmp))
+ ((and (not (region-active-p))
+ (or (progn
+ (setq tmp (key-binding "C-g"))
+ (and (not (symbolp tmp)) (commandp tmp t)))
+ (not (eq 'keyboard-quit tmp))))
+ (call-interactively tmp))
(t
(let (defined-fn
ergoemacs-shortcut-keys
- [elpa] 42/117: Possibly address Issue #276, (continued)
- [elpa] 42/117: Possibly address Issue #276, Matthew Fidler, 2014/07/25
- [elpa] 40/117: Make ergoemacs-shortcuts lexically scoped, Matthew Fidler, 2014/07/25
- [elpa] 45/117: Merge pull request #277 from pdg137/patch-1, Matthew Fidler, 2014/07/25
- [elpa] 44/117: Use M-h instead of M-H for comint-bol., Matthew Fidler, 2014/07/25
- [elpa] 48/117: Add support for dired+ prefixes, Matthew Fidler, 2014/07/25
- [elpa] 47/117: theme component support for if/dolist/mapc/mapcar/when, Matthew Fidler, 2014/07/25
- [elpa] 49/117: Merge branch 'master' of github.com:ergoemacs/ergoemacs-mode, Matthew Fidler, 2014/07/25
- [elpa] 43/117: Setup local overrides outside of minibuffers and overriding keymaps, Matthew Fidler, 2014/07/25
- [elpa] 52/117: Take out org-italic, Matthew Fidler, 2014/07/25
- [elpa] 51/117: Fix F8 map, Matthew Fidler, 2014/07/25
- [elpa] 50/117: Add lookup of C-g to ergoemacs-keyboard-quit,
Matthew Fidler <=
- [elpa] 55/117: Bug fix for ergoemacs-keyboard-quit, Matthew Fidler, 2014/07/25
- [elpa] 56/117: Add ability to "flatten" a composed keymap; Flatten maps that are always modified, Matthew Fidler, 2014/07/25
- [elpa] 58/117: Remove ergoemacs-read-modal-keymap function, Matthew Fidler, 2014/07/25
- [elpa] 53/117: Don't error on invalid menu., Matthew Fidler, 2014/07/25
- [elpa] 46/117: Install ergoemacs-read-default for every major mode, Matthew Fidler, 2014/07/25
- [elpa] 54/117: Fix menu keybinding preprocessing, Matthew Fidler, 2014/07/25
- [elpa] 57/117: Add first keyword, and use in minibuffer-setup-hook, Matthew Fidler, 2014/07/25
- [elpa] 60/117: Fix byte-compile warning, Matthew Fidler, 2014/07/25
- [elpa] 62/117: Update ergoemacs-mode-line custom description, Matthew Fidler, 2014/07/25
- [elpa] 61/117: Set ergoemacs-mode-line default to t, Matthew Fidler, 2014/07/25