[elpa] 03/117: Lexical binding for ergoemacs-advices

[Matthew Fidler]

mlf176f2 pushed a commit to branch externals/ergoemacs-mode
in repository elpa.

commit e2a8a8c43f076dc0dbd473d0b09b3df7221d7637
Author: Matthew L. Fidler <address@hidden>
Date:   Mon Jul 14 07:48:32 2014 -0500

    Lexical binding for ergoemacs-advices
---
 ergoemacs-advices.el |   13 +++++++++----
 ergoemacs-macros.el  |    2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ergoemacs-advices.el b/ergoemacs-advices.el
index b7de57d..8a0c3c6 100644
--- a/ergoemacs-advices.el
+++ b/ergoemacs-advices.el
@@ -1,4 +1,4 @@
-;;; ergoemacs-advices.el --- advices for ErgoEmacs
+;;; ergoemacs-advices.el --- advices for ErgoEmacs -*- lexical-binding: t -*-
 
 ;; Copyright © 2013, 2014  Free Software Foundation, Inc.
 
@@ -315,13 +315,18 @@ Uses `ergoemacs-real-key-description'."
 (defvar ergoemacs-original-keys-to-shortcut-keys-regexp)
 (defvar ergoemacs-original-keys-to-shortcut-keys)
 (defvar ergoemacs-unbind-keys)
+(defvar ergoemacs-read-input-keys)
+(defvar ergoemacs-repeat-keys)
+(defvar ergoemacs-shortcut-keys)
+(defvar ergoemacs-modal)
+(defvar ergoemacs-no-shortcut-keys)
+(defvar ergoemacs-use-unicode-brackets)
 (declare-function ergoemacs-emulations "ergoemacs-mode.el")
 (declare-function ergoemacs-remove-shortcuts "ergoemacs-shortcuts.el")
 (defun ergoemacs-substitute-command (string &optional map)
   "Substitutes command STRING within MAP or currently bound keys."
   (save-match-data
-    (let* (ret
-           (test (ergoemacs-with-global
+    (let* ((test (ergoemacs-with-global
                   (ergoemacs-real-substitute-command-keys
                    (or (and map (concat map string)) string))))
            (test-vect (read-kbd-macro test t))
@@ -444,7 +449,7 @@ Return the original STRING if no substitutions are made.
 Otherwise, return a new string, without any text properties."
   (save-match-data
     (if (not string) nil
-      (let (ret str mapvar (pt 0) tmp)
+      (let (ret mapvar (pt 0) tmp)
         (if (not ergoemacs-mode)
             (setq ret (ergoemacs-real-substitute-command-keys string))
           (while (string-match 
"\\(\\(?:\\\\=\\)?\\)\\\\\\(\\[\\|<\\|{\\)\\(.*?\\)\\(\\]\\|>\\|}\\)" string pt)
diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index fe5266f..5efd7bb 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -110,7 +110,7 @@ installing the original keymap above the ergoemacs-mode 
installed keymap.
 "
   `(let ((overriding-terminal-local-map overriding-terminal-local-map)
          (overriding-local-map overriding-local-map)
-         lookup tmp-overlay override-text-map)
+         tmp-overlay)
      ;; Remove most of ergoemacs-mode's key bindings
      (ergoemacs-emulations 'remove)
      (unwind-protect