diff options
| author | Philip Kaludercic <philipk@posteo.net> | 2023-05-27 10:13:21 +0200 |
|---|---|---|
| committer | Philip Kaludercic <philipk@posteo.net> | 2023-05-31 23:54:29 +0200 |
| commit | 17c7915ab947ebeec6ea5ad3eb4cad1f24d5d4fc (patch) | |
| tree | 847f26f7c382b9667d43b81d38463b8438dea5ec /lisp/emacs-lisp | |
| parent | e252ce26eab1e135ed294171b249d6560474bfd1 (diff) | |
| download | emacs-17c7915ab947ebeec6ea5ad3eb4cad1f24d5d4fc.tar.gz emacs-17c7915ab947ebeec6ea5ad3eb4cad1f24d5d4fc.tar.bz2 emacs-17c7915ab947ebeec6ea5ad3eb4cad1f24d5d4fc.zip | |
; Fix 'package-install-upgrade-built-in' check for package menu
* lisp/emacs-lisp/package.el (package-menu--find-upgrades): Use
correct check to verify if a built-in packages in the package menu can
be upgraded or not.
This change improves upon a faulty assumption from
ba2c76fa2bc3aabfda7d1d09cc5148f3f9d8e08e. (Bug#63587)
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 202aca36f24..8f266186d5e 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -3769,8 +3769,8 @@ object corresponding to the newer version." (and avail-pkg (version-list-< (package-desc-priority-version pkg-desc) (package-desc-priority-version avail-pkg)) - (xor (not package-install-upgrade-built-in) - (package--active-built-in-p pkg-desc)) + (or (not (package--active-built-in-p pkg-desc)) + package-install-upgrade-built-in) (push (cons name avail-pkg) upgrades)))) upgrades)) |