From 40133c84069510bc09ff2b460d0bf0f3da36097a Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 19 Jul 2014 13:13:08 +0100
Subject: Emacs: Fix package archive functions' for 24.3

---
 tag-emacs/emacs.d/init.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tag-emacs/emacs.d')

diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index b92b1fa..47fa705 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -60,7 +60,7 @@
 
 (defun package-list-installed ()
   (loop for pkg in package-activated-list
-        collect (cdr (assq pkg package-archive-contents))))
+        collect (assq pkg package-archive-contents)))
 
 (defun package-archive-stats ()
   (let ((archives (makehash))
@@ -70,15 +70,15 @@
     (maphash (lambda (k v)
                (setq assoc (cons (cons k v) assoc)))
              (dolist (pkg (-filter #'identity (package-list-installed)) archives)
-               (let ((pkg-arc (package-desc-archive pkg)))
+               (let ((pkg-arc (package-desc-archive (cdr pkg))))
                  (incf (gethash pkg-arc archives)))))
     assoc))
 
 (defun package-show-installed-from-archive (archive)
   (interactive (list (helm-comp-read "Archive: " (mapcar #'car package-archives)
                                       :must-match t)))
-  (let ((from-arc (mapcar #'package-desc-name
-                          (--filter (equalp (package-desc-archive it) archive)
+  (let ((from-arc (mapcar #'car
+                          (--filter (equalp (package-desc-archive (cdr it)) archive)
                                     (package-list-installed)))))
     (if (called-interactively-p)
         (message "%s" from-arc)
-- 
cgit 1.4.1