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
504fada7
Commit
504fada7
authored
Feb 03, 2015
by
Artur Malabarba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
emacs-lisp/package.el (package-desc-status): Add "dependency" status to Package Menu.
parent
c184e85e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
7 deletions
+21
-7
lisp/ChangeLog
lisp/ChangeLog
+6
-0
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+15
-7
No files found.
lisp/ChangeLog
View file @
504fada7
...
...
@@ -15,6 +15,12 @@
Special handling for empty `package-selected-packages'.
(package-install): Fix when PKG is a package-desc.
(package-desc-status): Add "dependency" status to the Package
Menu.
(package-menu--status-predicate, package-menu--print-info)
(package-menu-mark-delete, package-menu--find-upgrades)
(package-menu--status-predicate, describe-package-1): Use it
2015-02-03 Thierry Volpiatto <thierry.volpiatto@gmail.com>
* emacs-lisp/package.el (package-reinstall): Don't change package's selected status.
...
...
lisp/emacs-lisp/package.el
View file @
504fada7
...
...
@@ -1759,7 +1759,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
'font-lock-face
'font-lock-builtin-face
)
"."
))
(
pkg-dir
(
insert
(
propertize
(
if
(
equal
status
"unsigned"
)
(
insert
(
propertize
(
if
(
member
status
'
(
"unsigned"
"dependency"
)
)
"Installed"
(
capitalize
status
))
;FIXME: Why comment-face?
'font-lock-face
'font-lock-comment-face
))
...
...
@@ -2025,7 +2025,8 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC."
(
lle
(
assq
name
package-load-list
))
(
held
(
cadr
lle
))
(
version
(
package-desc-version
pkg-desc
))
(
signed
(
package-desc-signed
pkg-desc
)))
(
signed
(
or
(
not
package-list-unsigned
)
(
package-desc-signed
pkg-desc
))))
(
cond
((
eq
dir
'builtin
)
"built-in"
)
((
and
lle
(
null
held
))
"disabled"
)
...
...
@@ -2040,7 +2041,9 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC."
(
cond
((
not
(
file-exists-p
(
package-desc-dir
pkg-desc
)))
"deleted"
)
((
eq
pkg-desc
(
cadr
(
assq
name
package-alist
)))
(
if
(
or
(
not
package-list-unsigned
)
signed
)
"installed"
"unsigned"
))
(
if
(
not
signed
)
"unsigned"
(
if
(
package--user-selected-p
name
)
"installed"
"dependency"
)))
(
t
"obsolete"
)))
(
t
(
let*
((
ins
(
cadr
(
assq
name
package-alist
)))
...
...
@@ -2051,8 +2054,9 @@ package PKG-DESC, add one. The alist is keyed with PKG-DESC."
"new"
"available"
))
((
version-list-<
version
ins-v
)
"obsolete"
)
((
version-list-=
version
ins-v
)
(
if
(
or
(
not
package-list-unsigned
)
signed
)
"installed"
"unsigned"
))))))))
(
if
(
not
signed
)
"unsigned"
(
if
(
package--user-selected-p
name
)
"installed"
"dependency"
)))))))))
(
defun
package-menu--refresh
(
&optional
packages
keywords
)
"Re-populate the `tabulated-list-entries'.
...
...
@@ -2181,6 +2185,7 @@ Return (PKG-DESC [NAME VERSION STATUS DOC])."
(
`
"held"
'font-lock-constant-face
)
(
`
"disabled"
'font-lock-warning-face
)
(
`
"installed"
'font-lock-comment-face
)
(
`
"dependency"
'font-lock-comment-face
)
(
`
"unsigned"
'font-lock-warning-face
)
(
_
'font-lock-warning-face
))))
; obsolete.
(
list
pkg-desc
...
...
@@ -2223,7 +2228,8 @@ If optional arg BUTTON is non-nil, describe its associated package."
(
defun
package-menu-mark-delete
(
&optional
_num
)
"Mark a package for deletion and move to the next line."
(
interactive
"p"
)
(
if
(
member
(
package-menu-get-status
)
'
(
"installed"
"obsolete"
"unsigned"
))
(
if
(
member
(
package-menu-get-status
)
'
(
"installed"
"dependency"
"obsolete"
"unsigned"
))
(
tabulated-list-put-tag
"D"
t
)
(
forward-line
)))
...
...
@@ -2277,7 +2283,7 @@ If optional arg BUTTON is non-nil, describe its associated package."
;; ENTRY is (PKG-DESC [NAME VERSION STATUS DOC])
(
let
((
pkg-desc
(
car
entry
))
(
status
(
aref
(
cadr
entry
)
2
)))
(
cond
((
member
status
'
(
"installed"
"unsigned"
))
(
cond
((
member
status
'
(
"installed"
"dependency"
"unsigned"
))
(
push
pkg-desc
installed
))
((
member
status
'
(
"available"
"new"
))
(
setq
available
(
package--append-to-alist
pkg-desc
available
))))))
...
...
@@ -2393,6 +2399,8 @@ Optional argument NOQUERY non-nil means do not ask the user to confirm."
((
string=
sB
"available"
)
nil
)
((
string=
sA
"installed"
)
t
)
((
string=
sB
"installed"
)
nil
)
((
string=
sA
"dependency"
)
t
)
((
string=
sB
"dependency"
)
nil
)
((
string=
sA
"unsigned"
)
t
)
((
string=
sB
"unsigned"
)
nil
)
((
string=
sA
"held"
)
t
)
...
...
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