diff options
| author | Artur Malabarba | 2015-06-30 10:17:55 +0100 |
|---|---|---|
| committer | Artur Malabarba | 2015-06-30 10:19:15 +0100 |
| commit | d0a5162fd825acbbd863e61099e1fa1ce5975773 (patch) | |
| tree | 5fa0425dd3f782fdfbfe2fb1a9fdf715193b790b /lisp | |
| parent | ee0b83343231427fbdf954ce9e7d4f1632583245 (diff) | |
| download | emacs-d0a5162fd825acbbd863e61099e1fa1ce5975773.tar.gz emacs-d0a5162fd825acbbd863e61099e1fa1ce5975773.zip | |
* lisp/emacs-lisp/package.el (package--save-selected-packages):
Don't save before init time, to avoid overwriting configurations.
(Bug#20855)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 9f563457748..e599e840fb7 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -1620,12 +1620,14 @@ Used to populate `package-selected-packages'." | |||
| 1620 | unless (memq name dep-list) | 1620 | unless (memq name dep-list) |
| 1621 | collect name))) | 1621 | collect name))) |
| 1622 | 1622 | ||
| 1623 | (defun package--save-selected-packages (value) | 1623 | (defun package--save-selected-packages (&optional value) |
| 1624 | "Set and save `package-selected-packages' to VALUE." | 1624 | "Set and save `package-selected-packages' to VALUE." |
| 1625 | (let ((save-silently inhibit-message)) | 1625 | (when value |
| 1626 | (customize-save-variable | 1626 | (setq package-selected-packages value)) |
| 1627 | 'package-selected-packages | 1627 | (if after-init-time |
| 1628 | (setq package-selected-packages value)))) | 1628 | (let ((save-silently inhibit-message)) |
| 1629 | (customize-save-variable 'package-selected-packages package-selected-packages)) | ||
| 1630 | (add-hook 'after-init-hook #'package--save-selected-packages))) | ||
| 1629 | 1631 | ||
| 1630 | (defun package--user-selected-p (pkg) | 1632 | (defun package--user-selected-p (pkg) |
| 1631 | "Return non-nil if PKG is a package was installed by the user. | 1633 | "Return non-nil if PKG is a package was installed by the user. |