[elpa] externals/ergoemacs-mode bd805c3 80/87: More suppression of warnings

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit bd805c3278705588df05781559322fd3cd382ce7
Author: Matthew Fidler <514778+mattfidler@users.noreply.github.com>
Commit: Matthew Fidler <514778+mattfidler@users.noreply.github.com>

    More suppression of warnings
---
 ergoemacs-advice.el         |  8 +++++++-
 ergoemacs-command-loop.el   |  3 +++
 ergoemacs-functions.el      |  2 ++
 ergoemacs-map-properties.el | 17 ++++++-----------
 ergoemacs-theme-engine.el   |  2 +-
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ergoemacs-advice.el b/ergoemacs-advice.el
index e2320d3..c5c9b89 100644
--- a/ergoemacs-advice.el
+++ b/ergoemacs-advice.el
@@ -57,7 +57,13 @@
 (declare-function ergoemacs-translate--define-key "ergoemacs-translate")
 (declare-function ergoemacs-translate--apply-key "ergoemacs-translate")
 (declare-function ergoemacs-major-mode-menu-map "ergoemacs-lib")
-
+(declare-function ergoemacs-translate--get "ergoemacs-translate")
+(declare-function ergoemacs-translate--keymap "ergoemacs-translate")
+(declare-function ergoemacs-command-loop--modal-p "ergoemacs-command-loop")
+(declare-function ergoemacs-translation-struct-keymap-modal 
"ergoemacs-translate")
+(declare-function ergoemacs-command-loop--internal "ergoemacs-command-loop")
+(declare-function ergoemacs-command-loop--temp-message 
"ergoemacs-command-loop")
+(declare-function ergoemacs-key-description "ergoemacs-key-description")
 
 (defvar ergoemacs-advice--temp-replace-functions nil
   "List of `ergoemacs-mode' temporary replacement functions.
diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index a97e59c..1077d77 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -34,6 +34,7 @@
   (require 'ergoemacs-macros))
 
 
+(declare-function ergoemacs-translate--emacs-shift "ergoemacs-translate")
 (declare-function ergoemacs-warn "ergoemacs-lib")
 
 (declare-function guide-key/close-guide-buffer "guide-key")
@@ -95,6 +96,8 @@
 (defvar guide-key/guide-key-sequence)
 (defvar keyfreq-mode)
 (defvar keyfreq-table)
+(defvar ergoemacs-translate--emacs-shift)
+(defvar ergoemacs-command-loop-start)
 
 
 (defvar universal-argument-num-events) ;; Not in Emacs 24.5
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index 30994db..5ef76da 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -65,9 +65,11 @@
 
 (declare-function ergoemacs-map-- "ergoemacs-map")
 (declare-function ergoemacs-mode "ergoemacs-mode")
+(declare-function ergoemacs-map-properties--original 
"ergoemacs-map-properties")
 
 (declare-function ergoemacs-command-loop--modal-pop "ergoemacs-command-loop")
 (declare-function ergoemacs-theme-describe "ergoemacs-theme-engine")
+(declare-function ergoemacs-key-description "ergoemacs-key-description")
 
 (declare-function helm-attrset "helm")
 (declare-function helm-basename "helm-utils")
diff --git a/ergoemacs-map-properties.el b/ergoemacs-map-properties.el
index 6793600..dda0928 100644
--- a/ergoemacs-map-properties.el
+++ b/ergoemacs-map-properties.el
@@ -919,13 +919,12 @@ STRUCT is the keymap structure for the current map."
        (map-key
        (error "Will not label a composed map's members to %s" map-key))
        (t
-       (let ((parent (keymap-parent keymap))
-             (breadcrumb-base ergoemacs-map--breadcrumb)
-             (struct (or struct (ergoemacs-gethash map-key 
ergoemacs-map-properties--key-struct)))
-             (comp (plist-get struct :composed))
-             (comp-list (ergoemacs-map-properties--composed-list keymap))
-             from-prop-p
-             (i 0))
+       (let* ((breadcrumb-base ergoemacs-map--breadcrumb)
+              (struct (or struct (ergoemacs-gethash map-key 
ergoemacs-map-properties--key-struct)))
+              (comp (plist-get struct :composed))
+              (comp-list (ergoemacs-map-properties--composed-list keymap))
+              from-prop-p
+              (i 0))
          (unless (= (length comp) (length comp-list))
            (setq comp nil))
          (when (and ergoemacs-map-properties--breadcrumb
@@ -941,10 +940,6 @@ STRUCT is the keymap structure for the current map."
            (if comp
                (ergoemacs :label map nil (pop comp))
              (ergoemacs :label map)))
-         ;; (when parent
-         ;;   (when (and breadcrumb-base (not (string= breadcrumb-base "")))
-         ;;     (setq ergoemacs-map--breadcrumb (concat breadcrumb-base 
"-parent")))
-         ;;   (ergoemacs :label parent nil (plist-get struct :parent)))
          (if from-prop-p
              (setq ergoemacs-map-properties--breadcrumb breadcrumb-base)
            (setq ergoemacs-map--breadcrumb breadcrumb-base))))))
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index e5c54f9..196fc4c 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -665,7 +665,7 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
 # should be like ErgoEmacs.
 # If none of the keys work, try replacing all instances of \\e with \\M-.
 # That's means changing Esc to Meta key.
-\nset editing-mode emacs") tmp)
+\nset editing-mode emacs") tmp key-string)
     (with-temp-buffer
       (dolist (cmds ergoemacs-theme-create-bash-functions)
         (dolist (cmd cmds)