From d7d310a9ec055be7f44b33e7d2cc48579a5a5370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Wed, 25 Jul 2018 15:15:49 -0500 Subject: - Find and load the correct package.el --- lisp/init-elpa.el | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lisp/init-elpa.el') diff --git a/lisp/init-elpa.el b/lisp/init-elpa.el index 9bb2b2d..1a889b8 100644 --- 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 -- cgit v1.2.3