Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
2dbf4ffd
Commit
2dbf4ffd
authored
Jan 16, 2014
by
Dmitry Gutov
Browse files
* lisp/emacs-lisp/package.el (package-desc--keywords): Use `cdr' with
`assoc'. Make private. Update all callers.
parent
d967cd18
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
lisp/ChangeLog
lisp/ChangeLog
+5
-0
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+5
-5
No files found.
lisp/ChangeLog
View file @
2dbf4ffd
2014-01-16 Dmitry Gutov <dgutov@yandex.ru>
* emacs-lisp/package.el (package-desc--keywords): Use `cdr' with
`assoc'. Make private. Update all callers.
2014-01-16 Stefan Monnier <monnier@iro.umontreal.ca>
* follow.el (follow-adjust-window): Remove `dest' argument (bug#16426).
...
...
lisp/emacs-lisp/package.el
View file @
2dbf4ffd
...
...
@@ -387,8 +387,8 @@ Slots:
(
`
tar
".tar"
)
(
kind
(
error
"Unknown package kind: %s"
kind
))))
(
defun
package-desc-keywords
(
pkg-desc
)
(
let
((
keywords
(
assoc
:keywords
(
package-desc-extras
pkg-desc
))))
(
defun
package-desc-
-
keywords
(
pkg-desc
)
(
let
((
keywords
(
cdr
(
assoc
:keywords
(
package-desc-extras
pkg-desc
))))
)
(
if
(
eq
(
car-safe
keywords
)
'quote
)
(
cdr
keywords
)
keywords
)))
...
...
@@ -1387,7 +1387,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
(
archive
(
if
desc
(
package-desc-archive
desc
)))
(
extras
(
and
desc
(
package-desc-extras
desc
)))
(
homepage
(
cdr
(
assoc
:url
extras
)))
(
keywords
(
if
desc
(
package-desc-keywords
desc
)))
(
keywords
(
if
desc
(
package-desc-
-
keywords
desc
)))
(
built-in
(
eq
pkg-dir
'builtin
))
(
installable
(
and
archive
(
not
built-in
)))
(
status
(
if
desc
(
package-desc-status
desc
)
"orphan"
))
...
...
@@ -1738,7 +1738,7 @@ KEYWORDS should be nil or a list of keywords."
(
let
(
keywords
)
(
package--mapc
(
lambda
(
desc
)
(
let*
((
extras
(
and
desc
(
package-desc-extras
desc
)))
(
desc-keywords
(
and
desc
(
package-desc-keywords
desc
))))
(
desc-keywords
(
and
desc
(
package-desc-
-
keywords
desc
))))
(
setq
keywords
(
append
keywords
desc-keywords
)))))
keywords
))
...
...
@@ -1780,7 +1780,7 @@ Built-in packages are converted with `package--from-builtin'."
When none are given, the package matches."
(
if
keywords
(
let*
((
extras
(
and
desc
(
package-desc-extras
desc
)))
(
desc-keywords
(
and
desc
(
package-desc-keywords
desc
)))
(
desc-keywords
(
and
desc
(
package-desc-
-
keywords
desc
)))
found
)
(
dolist
(
k
keywords
)
(
when
(
and
(
not
found
)
...
...
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