- Find and load the correct package.el

2018-07-25 15:15:49 -05:00 · 2018-07-25 15:15:49 -05:00 · d7d310a9ec
commit d7d310a9ec
parent db5f35a1ad
1 changed files with 9 additions and 0 deletions
--- a/lisp/init-elpa.el
+++ b/lisp/init-elpa.el
@ -1,3 +1,12 @@
+;;; Find and load the correct package.el
+;; When switching between Emacs 23 and 24, we always use the bundled package.el in Emacs 24
+(let ((package-el-site-lisp-dir
+       (expand-file-name "site-lisp/package" user-emacs-directory)))
+  (when (and (file-directory-p package-el-site-lisp-dir)
+             (> emacs-major-version 23))
+    (message "Removing local package.el from load-path to avoid shadowing bundled version")
+    (setq load-path (remove package-el-site-lisp-dir load-path))))
+
 (require 'package)

 ;; Repositories