emacs/gnu.emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2026-09-10 15:56:35 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

; Fix 'package--save-selected-packages' edge case (Bug#81091)

Browse source 
* lisp/emacs-lisp/package.el (package--save-selected-packages-1):
Add new function to just save the current value of
'package-selected-packages'.
(package--save-selected-packages): Do not add the function
itself to 'after-init-hook' during init-time, to avoid
distinguishing between between function calls wheren the
function is invoked without any argument by the hook or with a
single nil argument.
This commit is contained in:
Philip Kaludercic 2026-08-02 13:43:58 +02:00
parent 983995b54c
commit 74ec15e768
No known key found for this signature in database
1 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1850,16 +1850,27 @@ Used to populate `package-selected-packages'."
unless (memq name dep-list)
collect name)))
(defun package--save-selected-packages-1 ()
"Save the current value of `package-selected-packages'."
(customize-save-variable
'package-selected-packages
(sort package-selected-packages #'string<)))
(defun package--save-selected-packages (&optional value)
"Set and save `package-selected-packages' to VALUE."
"Set `package-selected-packages' to VALUE.
During initialization, we record VALUE but to not persist it using
Customize, to avoid overwriting configurations that haven't yet been
loaded. After initisation we update the user option directly."
(when (or value after-init-time)
;; It is valid to set it to nil, for example when the last package
;; is uninstalled. But it shouldn't be done at init time, to
;; avoid overwriting configurations that haven't yet been loaded.
(setq package-selected-packages (sort value #'string<)))
;; is uninstalled. But it shouldn't be done at init time, to avoid
;; overwriting configurations that haven't yet been loaded. We fall
;; back to the default value of `package-selected-packages' when
;; this function is invoked by `after-init-hook'.
(setq package-selected-packages value))
(if after-init-time
(customize-save-variable 'package-selected-packages package-selected-packages)
(add-hook 'after-init-hook #'package--save-selected-packages)))
(package--save-selected-packages-1)
(add-hook 'after-init-hook #'package--save-selected-packages-1)))
(defun package--user-selected-p (pkg)
"Return non-nil if PKG is a package was installed by the user.