[elpa] 148/287: Fix more compiler issues and typos

[Matthew Fidler]

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

commit b714b041ad67d238982e774581d0ccf1d04b7ed1
Author: Matthew L. Fidler <address@hidden>
Date:   Wed Jun 18 13:41:49 2014 -0500

    Fix more compiler issues and typos
---
 ergoemacs-functions.el |   27 ++++++++++++++-------------
 ergoemacs-translate.el |    4 ++--
 ergoemacs-unbind.el    |    6 +++---
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index d5a60d5..f69b091 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -1884,6 +1884,7 @@ If arg is a negative prefix, copy file path only"
 (defvar ergoemacs-theme--object)
 (declare-function ergoemacs-gen-svg "ergoemacs-extras.el")
 (declare-function ergoemacs-theme-component-map-list-md5 
"ergoemacs-theme-engine.el")
+(defvar ergoemacs-theme-options)
 (defun ergoemacs-display-current-svg (&optional arg)
   "Generates the current ergoemacs layout, unless it already exists and opens 
it in a browser.
 With a prefix, force regeneration. "
@@ -2087,43 +2088,43 @@ For a list of online reference sites, see:
   "Lookup urrent word or text selection in Google Search.
 See also `ergoemacs-lookup-word-on-internet'."
   (interactive)
-  (let ((dictUrl "http://www.google.com/search?q=�";))
-    (ergoemacs-lookup-word-on-internet input-word dictUrl)))
+  (let ((dict-url "http://www.google.com/search?q=�";))
+    (ergoemacs-lookup-word-on-internet input-word dict-url)))
 
 (defun ergoemacs-lookup-wikipedia (&optional input-word)
   "Lookup current word or text selection in Wikipedia.
 See also `ergoemacs-lookup-word-on-internet'."
   (interactive)
-  (let ((dictUrl "http://en.wikipedia.org/wiki/�";))
-    (ergoemacs-lookup-word-on-internet input-word dictUrl)))
+  (let ((dict-url "http://en.wikipedia.org/wiki/�";))
+    (ergoemacs-lookup-word-on-internet input-word dict-url)))
 
 (defun ergoemacs-lookup-word-dict-org (&optional input-word)
   "Lookup definition of current word or text selection in URL 
`http://dict.org/'.
 See also `ergoemacs-lookup-word-on-internet'."
   (interactive)
-  (let ((dictUrl "http://www.dict.org/bin/Dict?Form=Dict2&Database=*&Query=�"; 
))
-    (ergoemacs-lookup-word-on-internet input-word dictUrl)))
+  (let ((dict-url "http://www.dict.org/bin/Dict?Form=Dict2&Database=*&Query=�"; 
))
+    (ergoemacs-lookup-word-on-internet input-word dict-url)))
 
 (defun ergoemacs-lookup-word-definition (&optional input-word)
   "Lookup definition of current word or text selection in URL 
`http://thefreedictionary.com/'.
 See also `ergoemacs-lookup-word-on-internet'."
   (interactive)
-  (let ((dictUrl "http://www.thefreedictionary.com/�";))
-    (ergoemacs-lookup-word-on-internet input-word dictUrl)))
+  (let ((dict-url "http://www.thefreedictionary.com/�";))
+    (ergoemacs-lookup-word-on-internet input-word dict-url)))
 
 (defun ergoemacs-lookup-answers.com (&optional input-word)
   "Lookup current word or text selection in URL `http://answers.com/'.
 See also `ergoemacs-lookup-word-on-internet'."
   (interactive)
-  (let ((dictUrl "http://www.answers.com/main/ntquery?s=�";))
-    (ergoemacs-lookup-word-on-internet input-word dictUrl)))
+  (let ((dict-url "http://www.answers.com/main/ntquery?s=�";))
+    (ergoemacs-lookup-word-on-internet input-word dict-url)))
 
 (defun ergoemacs-lookup-wiktionary (&optional input-word)
   "Lookup definition of current word or text selection in URL 
`http://en.wiktionary.org/'
 See also `ergoemacs-lookup-word-on-internet'."
   (interactive)
-  (let ((dictUrl "http://en.wiktionary.org/wiki/�"; ))
-    (ergoemacs-lookup-word-on-internet input-word dictUrl) ) )
+  (let ((dict-url "http://en.wiktionary.org/wiki/�"; ))
+    (ergoemacs-lookup-word-on-internet input-word dict-url) ) )
 
 (defun ergoemacs-lookup-all-dictionaries (&optional input-word)
   "Lookup definition in many dictionaries.
@@ -2133,7 +2134,7 @@ The dictionaries used are in `ergoemacs-all-dictionaries'.
 See also `ergoemacs-lookup-word-on-internet'."
   (interactive)
   (dolist (dict-url ergoemacs-all-dictionaries)
-    (ergoemacs-lookup-word-on-internet input-word dictUrl)))
+    (ergoemacs-lookup-word-on-internet input-word dict-url)))
 
 (defvar ergoemacs-shortcut-keys)
 (defvar ergoemacs-read-input-keys)
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index f0e928f..94e1103 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -381,7 +381,7 @@ This function is made in `ergoemacs-translation'")
               (interactive)
               (ergoemacs-universal-argument ',(plist-get arg-plist ':name)))))
     (pushnew (intern (concat "ergoemacs-" (symbol-name (plist-get arg-plist 
':name)) "-universal-argument"))
-             :test 'equal)
+             ergoemacs-universal-fns)
 
     (eval (macroexpand
            `(defun ,(intern (concat "ergoemacs-" (symbol-name (plist-get 
arg-plist ':name)) "-digit-argument")) ()
@@ -844,7 +844,7 @@ and `ergoemacs-pretty-key' descriptions.
         (while (< i len)
           (unless (or (string= "" (nth i base))
                       (string= "" (nth i lay)))
-            (pusnew `(,(nth i base) . ,(nth i lay))
+            (pushnew `(,(nth i base) . ,(nth i lay))
                     ergoemacs-translation-assoc
                     :test 'equal))
           (setq i (+ i 1)))
diff --git a/ergoemacs-unbind.el b/ergoemacs-unbind.el
index 0e2d080..c246e53 100644
--- a/ergoemacs-unbind.el
+++ b/ergoemacs-unbind.el
@@ -737,7 +737,7 @@
     (let ((key (read-kbd-macro (nth 0 x))))
       (dolist (fn (nth 1 x))
         (let ((keys (gethash fn ergoemacs-where-is-global-hash)))
-          (pushnew key keys :test equal)
+          (pushnew key keys :test 'equal)
           (puthash fn keys ergoemacs-where-is-global-hash))))))
 
 
@@ -753,7 +753,7 @@
              (setq fn (lookup-key global-map (read-kbd-macro first)))
              (if (not (functionp fn))
                  elt
-               (pusnew fn last :test 'equal)
+               (pushnew fn last :test 'equal)
                `(,first ,last))))
          ergoemacs-emacs-default-bindings))
   (ergoemacs-reset-global-where-is))
@@ -899,7 +899,7 @@ This should only be run when no global keys have been set.
                       (unless (integerp trans-function)
                         (ergoemacs-global-fix-defualt-bindings key-kbd 
trans-function))))
                   (pushnew key-kbd ergoemacs-global-changed-cache :test 
'equal))
-              (pusnew key-kbd ergoemacs-global-not-changed-cache :test 'equal))
+              (pushnew key-kbd ergoemacs-global-not-changed-cache :test 
'equal))
             has-changed))))))
 
 (declare-function ergoemacs-get-fixed-layout "ergoemacs-translate.el")