Merge from emacs-24; up to 2014-03-21T21:27:25Z!dancol@dancol.org

This commit is contained in:
Glenn Morris 2014-03-22 14:44:04 -07:00
commit 299ccd03f9
8 changed files with 183 additions and 112 deletions

View file

@ -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)))