mlf176f2 pushed a commit to branch externals/ergoemacs-mode in repository elpa.
commit 91b83861385bbd59b0155a1e823b955e34499616 Author: Matthew L. Fidler <[email protected]> Date: Mon Jun 9 09:38:34 2014 -0500 Fixed mapvar issues. --- ergoemacs-advices.el | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el index 684cdf2..eb4fbec 100644 --- a/ergoemacs-advices.el +++ b/ergoemacs-advices.el @@ -302,16 +302,13 @@ Actual substitute-command-keys is always in `ergoemacs-real-substitute-command-k (with-temp-buffer (insert string) (goto-char (point-min)) - (while (re-search-forward "\\<M-x " nil t) - (replace-match (ergoemacs-substitute-command "\\[execute-extended-command] " "\\<global-map>") t t)) - (goto-char (point-min)) (while (re-search-forward "\\(\\(?:\\\\=\\)?\\)\\\\\\(\\[\\|<\\|{\\)\\(.*?\\)\\(\\]\\|>\\|}\\)" nil t) (cond ((string-match-p "\\\\=" (match-string 1)) (replace-match "\\\\\\2\\3\\4" t nil)) ((and (string-match-p "<" (match-string 2)) (string-match-p ">" (match-string 4))) - (setq mapvar (match-string 3)) + (setq mapvar (concat "\\<" (match-string 3) ">")) (replace-match "")) ((and (string-match-p "{" (match-string 2)) (string-match-p "}" (match-string 4))) @@ -323,6 +320,9 @@ Actual substitute-command-keys is always in `ergoemacs-real-substitute-command-k (while (re-search-forward "\\\\=" nil t) (replace-match "" t t) (re-search-forward "\\=\\\\=" nil t)) + (goto-char (point-min)) + (while (re-search-forward "\\(\\<M-x\\|<execute>\\) " nil t) + (replace-match (ergoemacs-substitute-command "\\[execute-extended-command] " "\\<global-map>") t t)) (setq ret (buffer-string)))) ret)))
