procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "* package.el (package--get-activatable-pkg): Prefer source packages"

Browse source 
This reverts commit fb87d5008e.
It caused problems when new versions of packages are installed
without deleting old versions.  (Bug#63757)
This commit is contained in:
Eli Zaretskii 2023-06-08 12:23:11 +03:00
parent 65f355ea0a
commit 90eadc3e23
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/emacs-lisp/package.el
View file

@ -924,22 +924,14 @@ correspond to previously loaded files."
(defun package--get-activatable-pkg (pkg-name) (defun package--get-activatable-pkg (pkg-name)
;; Is "activatable" a word? ;; Is "activatable" a word?
(let ((pkg-descs (sort (cdr (assq pkg-name package-alist)) (let ((pkg-descs (cdr (assq pkg-name package-alist))))
(lambda (p1 p2)
(let ((v1 (package-desc-version p1))
(v2 (package-desc-version p2)))
(or
;; Prefer VC packages.
(package-vc-p p1)
(package-vc-p p2)
;; Prefer builtin packages.
(package-disabled-p p1 v1)
(not (package-disabled-p p2 v2))))))))
;; Check if PACKAGE is available in `package-alist'. ;; Check if PACKAGE is available in `package-alist'.
(while (while
(when pkg-descs (when pkg-descs
(let ((available-version (package-desc-version (car pkg-descs)))) (let ((available-version (package-desc-version (car pkg-descs))))
(package-disabled-p pkg-name available-version))) (or (package-disabled-p pkg-name available-version)
;; Prefer a builtin package.
(package-built-in-p pkg-name available-version))))
(setq pkg-descs (cdr pkg-descs))) (setq pkg-descs (cdr pkg-descs)))
(car pkg-descs))) (car pkg-descs)))