diff options
| author | Jesús <heckyel@hyperbola.info> | 2018-07-25 15:15:49 -0500 |
|---|---|---|
| committer | Jesús <heckyel@hyperbola.info> | 2018-07-25 15:15:49 -0500 |
| commit | d7d310a9ec055be7f44b33e7d2cc48579a5a5370 (patch) | |
| tree | ee342f46608b8d6a895ded721cf12d2ef4041d11 | |
| parent | db5f35a1ad5795e0cb2b687def5763d93c7bbc17 (diff) | |
| download | emacs-base-d7d310a9ec055be7f44b33e7d2cc48579a5a5370.tar.lz emacs-base-d7d310a9ec055be7f44b33e7d2cc48579a5a5370.tar.xz emacs-base-d7d310a9ec055be7f44b33e7d2cc48579a5a5370.zip | |
- Find and load the correct package.el
| -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 |