mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 065f38dd7fbea32bbdf13867a34830a8f304089e Author: Matthew L. Fidler <[email protected]> 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)))
