Re: Elpa packages and macro dependencies.

[Artur Malabarba <bruce.connor.am@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

2014-10-20 10:33 GMT+01:00 Artur Malabarba <bruce.connor.am@gmail.com>:

> Here's what I had in mind. [...]

So, where are we on this?

I'm attaching a proper patch.
To reiterate, this makes package.el, after installing a package, call
`load` on any file which corresponds to an already loaded fature.
This should fix packages whose upgrade is messed up because of macro
dependencies.

Is it ok to apply or is it too hacky?

[-- Attachment #2: 0001-lisp-emacs-lisp-package.el-Reload-loaded-packages-af.patch --]
[-- Type: application/octet-stream, Size: 2819 bytes --]

From d3f79fe7d21f804a90ac055bddb0427e0d6da19d Mon Sep 17 00:00:00 2001
From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Thu, 13 Nov 2014 11:51:35 +0000
Subject: [PATCH] lisp/emacs-lisp/package.el: Reload loaded packages after
 installation.

---
 lisp/emacs-lisp/package.el | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 4e5c397..34e200e 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -524,9 +524,16 @@ Return the max version (as a string) if the package is held at a lower version."
       (error "Internal error: unable to find directory for `%s'"
 	     (package-desc-full-name pkg-desc)))
     ;; Add to load path, add autoloads, and activate the package.
-    (let ((old-lp load-path))
-      (with-demoted-errors
-        (load (expand-file-name (format "%s-autoloads" name) pkg-dir) nil t))
+    (let ((old-lp load-path)
+          (autoloads-file (format "%s-autoloads" name)))
+      (with-demoted-errors (format "Error loading %s: %%s" name)
+        (load (expand-file-name autoloads-file pkg-dir) nil t)
+        ;; Call `load' on all files in `pkg-dir' which correspond to
+        ;; provided features. Skip autoloads file since we already
+        ;; evaluated it above.
+        (mapc (lambda (file) (load (expand-file-name file pkg-dir) nil t))
+              ;; The autoloads file is usually not a feature, but better stay safe.
+              (remove autoloads-file (package-list-loaded-files pkg-dir))))
       (when (and (eq old-lp load-path)
                  (not (or (member pkg-dir load-path)
                           (member pkg-dir-dir load-path))))
@@ -543,6 +550,24 @@ Return the max version (as a string) if the package is held at a lower version."
     ;; Don't return nil.
     t))
 
+(defun package-list-loaded-files (dir)
+  "List all files in DIR which correspond to loaded features.
+Returns the `file-name-base' of each file, sorted by most
+recently loaded last."
+  (mapcar
+   ;; Turn the list of cons back into a list of files.
+   #'car
+   (sort
+    (remove nil (mapcar 
+                 (lambda (x) (let* ((name (file-name-base x))
+                               (hist (memq (intern-soft name) features)))
+                          ;; Return (FILENAME . HISTORY-POSITION)
+                          (when hist
+                            (cons name (length hist)))))
+                 (directory-files "./" nil "^[^\\.].*\\.el\\'" 'nosort)))
+    ;; The cdr is the position in history
+    (lambda (x y) (< (cdr x) (cdr y))))))
+
 (defun package-built-in-p (package &optional min-version)
   "Return true if PACKAGE is built-in to Emacs.
 Optional arg MIN-VERSION, if non-nil, should be a version list
-- 
1.7.12.4