Always install packages into an emacs-versioned elpa subdir, e.g. elp…

…a-25.1 See purcell#418
frwdrik · Mar 24, 2017 · 4657693 · 4657693
1 parent 6c64f8e
commit 4657693
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/lisp/init-elpa.el b/lisp/init-elpa.el
@@ -11,6 +11,19 @@
 (require 'package)
 
 
+
+;;; Install into separate package dirs for each Emacs version, to prevent bytecode incompatibility
+(let ((versioned-package-dir
+       (expand-file-name (format "elpa-%s.%s" emacs-major-version emacs-minor-version)
+                         user-emacs-directory)))
+  (when (file-directory-p package-user-dir)
+    (message "Default package locations have changed in this config: renaming old package dir %s to %s."
+             package-user-dir
+             versioned-package-dir)
+    (rename-file package-user-dir versioned-package-dir))
+  (setq package-user-dir versioned-package-dir))
+
+
 
 ;;; Standard package repositories
 

diff --git a/test-startup.sh b/test-startup.sh
@@ -9,7 +9,6 @@ ${EMACS:=emacs} -nw --batch \
                 --eval '(let ((debug-on-error t)
                               (url-show-status nil)
                               (user-emacs-directory default-directory)
-                              (package-user-dir (expand-file-name (concat "elpa-" emacs-version)))
                               (user-init-file (expand-file-name "init.el"))
                               (load-path (delq default-directory load-path)))
                            (load-file user-init-file)