[elpa] 13/117: Remove pop dependence

[Matthew Fidler]

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

commit 07a107bbe69c85ccc71a093439c412558a22287d
Author: Matthew L. Fidler <address@hidden>
Date:   Mon Jul 14 09:50:47 2014 -0500

    Remove pop dependence
---
 ergoemacs-macros.el       |   10 ++++------
 ergoemacs-theme-engine.el |   15 ++++++++-------
 ergoemacs-translate.el    |    4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 11c114d..da32ffd 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -283,12 +283,10 @@ additional parsing routines defined by PARSE-FUNCTION."
                     (error nil))
                   (push (cons ':name (pop remaining)) extracted-key-accu)
                 (push (cons ':name  (symbol-name (pop remaining))) 
extracted-key-accu))
-              ;; Useless logical construct to ignore byte-compile
-              ;; warning of (pop remaining).
-              (when (or (and (memq (type-of (first remaining)) '(symbol cons)) 
(pop remaining)) t)
-                (when (stringp (first remaining))
-                  (push (cons ':description (pop remaining)) 
extracted-key-accu))
-                ))
+              (when (memq (type-of (first remaining)) '(symbol cons))
+                (setq remaining (cdr remaining)))
+              (when (stringp (first remaining))
+                (push (cons ':description (pop remaining)) 
extracted-key-accu)))
             (while (and (consp remaining) (keywordp (first remaining)))
               (let ((keyword (pop remaining)))
                 (unless (consp remaining)
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 6f7a7a8..8d8463c 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -815,8 +815,8 @@ Assumes maps are orthogonal."
      (parent
       (make-composed-keymap (list map1 map2)))
      (t
-      (pop map1)
-      (pop map2)
+      (setq map1 (cdr map1))
+      (setq map2 (cdr map2))
       (setq map1 (append map1 map2))
       (push 'keymap map1)
       (copy-keymap map1)))))
@@ -1301,8 +1301,8 @@ FULL-SHORTCUT-MAP-P "
                   (cond
                    ((ignore-errors
                       (and (eq (nth 0 (nth 1 n-map)) 'keymap)
-                           (not (keymap-parent n-map))
-                           (pop n-map)))
+                           (not (keymap-parent n-map))))
+                    (setq n-map (cdr n-map))
                     ;; (push (make-sparse-keymap "ergoemacs-modified") n-map)
                     )
                    (t
@@ -1371,8 +1371,9 @@ The actual keymap changes are included in 
`ergoemacs-emulation-mode-map-alist'."
         ;; playing with pointers in C.
         ;;(setq final-map (ergoemacs-get-fixed-map--combine-maps menu-keymap 
final-map))
         ;; Use a combined keymap instead
-        (if (not (and (ignore-errors (nth 0 (nth 1 final-map))) (pop 
final-map)))
-            (setq final-map (list final-map)))
+        (if (ignore-errors (nth 0 (nth 1 final-map)))
+            (setq final-map (cdr final-map))
+          (setq final-map (list final-map)))
         (push menu-keymap final-map)
         (setq final-map (make-composed-keymap final-map))
         ;; Rebuild Shortcut hash
@@ -2280,7 +2281,7 @@ Returns new keymap."
         (let ((new-keymap (copy-keymap keymap)) _ignore)
           (cond
            ((keymapp (nth 1 new-keymap))
-            (pop new-keymap)
+            (setq new-keymap (cdr new-keymap))
             (setq new-keymap
                   (mapcar
                    (lambda(map)
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index a1cff4f..733fa59 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -997,9 +997,9 @@ Based on `ergoemacs-with-ergoemacs'"
       ergoemacs-command-shortcuts-hash)
      (if (not use-apps)
          (while (and ret (eq (elt (nth 0 ret) 0) 'apps))
-           (pop ret))
+           (setq ret (cdr ret)))
        (while (and ret (not (eq (elt (nth 0 ret) 0) 'apps)))
-         (pop ret)))
+         (setq ret (cdr ret))))
      (setq ret (nth 0 ret))
      ret)))