summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-03-22 14:44:04 -0700
committerGlenn Morris <rgm@gnu.org>2014-03-22 14:44:04 -0700
commit299ccd03f94008a1580a0dbbfd56c32484dd20f8 (patch)
tree04820a73c520d61af01bec3cbf5c37787161cacc /lisp/emacs-lisp
parent2ffb10e07574a5a357d2b3e10a4cc7f53ba1521c (diff)
parent4118be693dfc66e3640276e404012135ffbf07d4 (diff)
downloademacs-299ccd03f94008a1580a0dbbfd56c32484dd20f8.tar.gz
Merge from emacs-24; up to 2014-03-21T21:27:25Z!dancol@dancol.org
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ae2c2862887..480fddbd320 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -334,7 +334,7 @@ contrast, `package-user-dir' contains packages for personal use."
(when value
(push (cons (car rest-plist)
(if (eq (car-safe value) 'quote)
- (cdr value)
+ (cadr value)
value))
alist))))
(setq rest-plist (cddr rest-plist)))