emacs-29 17c7915ab94: ; Fix 'package-install-upgrade-built-in' check for package menu

[Philip Kaludercic]

branch: emacs-29
commit 17c7915ab947ebeec6ea5ad3eb4cad1f24d5d4fc
Author: Philip Kaludercic <philipk@posteo.net>
Commit: Philip Kaludercic <philipk@posteo.net>

    ; 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)
---
 lisp/emacs-lisp/package.el | 4 ++--
 1 file 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))