diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2014-01-16 14:23:14 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2014-01-16 14:23:14 +0200 |
| commit | 2dbf4ffdda88a57842a07b8a4658858df34b47bc (patch) | |
| tree | 112354ba56ff8fdcf84273a8ec395a811d2d529f /lisp/emacs-lisp/package.el | |
| parent | d967cd184c6dff62705de16823ca92b0ceb7ba23 (diff) | |
| download | emacs-2dbf4ffdda88a57842a07b8a4658858df34b47bc.tar.gz | |
* lisp/emacs-lisp/package.el (package-desc--keywords): Use `cdr' with
`assoc'. Make private. Update all callers.
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 465eac9daf7..c130b5fbdf3 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -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) |