[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 51/287: more substitute-command-keys fixes
From: |
Matthew Fidler |
Subject: |
[elpa] 51/287: more substitute-command-keys fixes |
Date: |
Wed, 02 Jul 2014 14:44:32 +0000 |
mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.
commit 065f38dd7fbea32bbdf13867a34830a8f304089e
Author: Matthew L. Fidler <address@hidden>
Date: Thu Jun 5 00:04:38 2014 +0800
more substitute-command-keys fixes
---
ergoemacs-advices.el | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el
index 785eab7..5c93deb 100644
--- a/ergoemacs-advices.el
+++ b/ergoemacs-advices.el
@@ -253,8 +253,6 @@ will add MAP to substitution."
(let (ergoemacs-modal ergoemacs-repeat-keys ergoemacs-read-input-keys
ergoemacs-shortcut-keys)
(setq test (funcall function string))
- (while (string-match "^.*\\<ergoemacs-shortcut.*\n" test)
- (setq test (replace-match "" nil nil test)))
(when (string-match ".*\n.*\n" test)
(setq ret (ergoemacs-substitute-map--1
(concat (match-string 0 test)
@@ -263,6 +261,13 @@ will add MAP to substitution."
(with-temp-buffer
(insert ret)
(goto-char (point-min))
+ (while (re-search-forward ".*\\(ergoemacs-shortcut\\|Prefix
Command\\).*" nil t)
+ (delete-region (point-at-bol) (point-at-eol))
+ (when (looking-at "\n+")
+ (replace-match "")))
+ (while (search-forward "`??'" nil t)
+ (replace-match (concat " " (ergoemacs-unicode-char "λ" "?") " ")))
+ (goto-char (point-min))
(forward-line 2)
(while (re-search-forward "^|\\(.*?\\)[ \t]+|" nil t)
(setq test (ergoemacs-pretty-key (match-string 1)))
- [elpa] 44/287: Suppress shortcuts, (continued)
- [elpa] 44/287: Suppress shortcuts, Matthew Fidler, 2014/07/02
- [elpa] 39/287: Starting applying keymaps to ergoemacs-emulation-mode-map-alist, Matthew Fidler, 2014/07/02
- [elpa] 45/287: Fix ergoemacs-describe-key, Matthew Fidler, 2014/07/02
- [elpa] 31/287: Created composite map list, Matthew Fidler, 2014/07/02
- [elpa] 42/287: Push shortcuts to the bottom. Should allow overrides., Matthew Fidler, 2014/07/02
- [elpa] 49/287: Bug fix for substitute-command-keys, Matthew Fidler, 2014/07/02
- [elpa] 43/287: Be more conservative with substituting key commands., Matthew Fidler, 2014/07/02
- [elpa] 46/287: Fix Issue #7, Matthew Fidler, 2014/07/02
- [elpa] 50/287: Another bug-fix for substitute-command-keys, Matthew Fidler, 2014/07/02
- [elpa] 52/287: Debugging ergoemacs-theme obect, Matthew Fidler, 2014/07/02
- [elpa] 51/287: more substitute-command-keys fixes,
Matthew Fidler <=
- [elpa] 58/287: Fix misplaced paren, Matthew Fidler, 2014/07/02
- [elpa] 57/287: Added basic variable/mode initialization routines., Matthew Fidler, 2014/07/02
- [elpa] 54/287: Maps seem correct now, Matthew Fidler, 2014/07/02
- [elpa] 48/287: Unstage the incompatible, Matthew Fidler, 2014/07/02
- [elpa] 55/287: Nicer theme debugging display, Matthew Fidler, 2014/07/02
- [elpa] 56/287: Better key replacements., Matthew Fidler, 2014/07/02
- [elpa] 64/287: Replace either M-x or <execute> with M-x code., Matthew Fidler, 2014/07/02
- [elpa] 63/287: Fixed mapvar issues., Matthew Fidler, 2014/07/02
- [elpa] 47/287: Stage some components, Matthew Fidler, 2014/07/02
- [elpa] 62/287: Playing with object more., Matthew Fidler, 2014/07/02