[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 42/117: Possibly address Issue #276
From: |
Matthew Fidler |
Subject: |
[elpa] 42/117: Possibly address Issue #276 |
Date: |
Fri, 25 Jul 2014 13:24:06 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit 81a03433c06b1ba8336a810334f5b2b98e826bc0
Author: Matthew L. Fidler <address@hidden>
Date: Wed Jul 16 13:40:42 2014 -0500
Possibly address Issue #276
---
ergoemacs-advices.el | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el
index b4bf395..28e066d 100644
--- a/ergoemacs-advices.el
+++ b/ergoemacs-advices.el
@@ -72,8 +72,9 @@ If `pre-command-hook' is used and `ergoemacs-mode' is remove
from `ergoemacs-pre
(defadvice define-key (around ergoemacs-define-key-advice (keymap key def)
activate)
"This does the right thing when modifying `ergoemacs-keymap'.
Also adds keymap-flag for user-defined keys run with `run-mode-hooks'."
- (let ((is-global-p (equal keymap (current-global-map))))
- (if (and ergoemacs-run-mode-hooks
+ (let ((is-global-p (equal keymap (current-global-map)))
+ (is-local-p (equal keymap (current-local-map))))
+ (if (and (or is-local-p ergoemacs-run-mode-hooks)
(not (equal keymap (current-global-map)))
(not (equal keymap ergoemacs-keymap)))
(let ((ergoemacs-run-mode-hooks nil)
- [elpa] 33/117: Added space as separtor for PS1 prompt, (continued)
- [elpa] 33/117: Added space as separtor for PS1 prompt, Matthew Fidler, 2014/07/25
- [elpa] 35/117: Remap shell to ergoemacs-shell-here, Matthew Fidler, 2014/07/25
- [elpa] 28/117: Add unix shell support, Matthew Fidler, 2014/07/25
- [elpa] 36/117: Add eshell here and powershell key, Matthew Fidler, 2014/07/25
- [elpa] 37/117: Make C-u show ergoemacs-keys when unspecified, Matthew Fidler, 2014/07/25
- [elpa] 38/117: Make ergoemacs-track use lexical scoping, Matthew Fidler, 2014/07/25
- [elpa] 39/117: Make ergoemacs-unbind lexically scoped, Matthew Fidler, 2014/07/25
- [elpa] 34/117: Use abbreviated file name for shell here, Matthew Fidler, 2014/07/25
- [elpa] 32/117: Took out space requirement for dirtrack-list, Matthew Fidler, 2014/07/25
- [elpa] 41/117: Remove remnants of original local-set-key advice., Matthew Fidler, 2014/07/25
- [elpa] 42/117: Possibly address Issue #276,
Matthew Fidler <=
- [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, 2014/07/25