Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
5b83f037
Commit
5b83f037
authored
Feb 04, 2015
by
Artur Malabarba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
emacs-lisp/package.el (package-delete): Always unselect package.
parent
25224ab2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
5 deletions
+12
-5
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+7
-5
No files found.
lisp/ChangeLog
View file @
5b83f037
2015-02-04 Artur Malabarba <bruce.connor.am@gmail.com>
* emacs-lisp/package.el (package-delete): Remove package from
`package-selected-packages' even if it can't be deleted.
2015-02-03 Artur Malabarba <bruce.connor.am@gmail.com>
* emacs-lisp/package.el (package-delete): Document NOSAVE.
...
...
lisp/emacs-lisp/package.el
View file @
5b83f037
...
...
@@ -1506,6 +1506,13 @@ If NOSAVE is non-nil, the package is not removed from
(
let
((
dir
(
package-desc-dir
pkg-desc
))
(
name
(
package-desc-name
pkg-desc
))
pkg-used-elsewhere-by
)
;; If the user is trying to delete this package, they definitely
;; don't want it marked as selected, so we remove it from
;; `package-selected-packages' even if it can't be deleted.
(
when
(
and
(
null
nosave
)
(
package--user-selected-p
name
))
(
customize-save-variable
'package-selected-packages
(
remove
name
package-selected-packages
)))
(
cond
((
not
(
string-prefix-p
(
file-name-as-directory
(
expand-file-name
package-user-dir
))
(
expand-file-name
dir
)))
...
...
@@ -1530,11 +1537,6 @@ If NOSAVE is non-nil, the package is not removed from
(
delete
pkg-desc
pkgs
)
(
unless
(
cdr
pkgs
)
(
setq
package-alist
(
delq
pkgs
package-alist
))))
;; Update package-selected-packages.
(
when
(
and
(
null
nosave
)
(
package--user-selected-p
name
))
(
customize-save-variable
'package-selected-packages
(
remove
name
package-selected-packages
)))
(
message
"Package `%s' deleted."
(
package-desc-full-name
pkg-desc
))))))
(
defun
package--removable-packages
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment