diff options
| -rw-r--r-- | lisp/init-elpa.el | 9 |
1 files changed, 9 insertions, 0 deletions
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 |