[Emacs-diffs] trunk r116042: * lisp/emacs-lisp/package.el (package-desc--keywords): Use `cdr' with

[Dmitry Gutov]

------------------------------------------------------------
revno: 116042
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Thu 2014-01-16 14:23:14 +0200
message:
  * lisp/emacs-lisp/package.el (package-desc--keywords): Use `cdr' with
  `assoc'.  Make private.  Update all callers.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-16 00:26:45 +0000
+++ b/lisp/ChangeLog    2014-01-16 12:23:14 +0000
@@ -1,3 +1,8 @@
+2014-01-16  Dmitry Gutov  <address@hidden>
+
+       * emacs-lisp/package.el (package-desc--keywords): Use `cdr' with
+       `assoc'.  Make private.  Update all callers.
+
 2014-01-16  Stefan Monnier  <address@hidden>
 
        * follow.el (follow-adjust-window): Remove `dest' argument (bug#16426).

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-01-15 04:58:06 +0000
+++ b/lisp/emacs-lisp/package.el        2014-01-16 12:23:14 +0000
@@ -387,8 +387,8 @@
     (`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 @@
          (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 @@
   (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 @@
 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)