Merge changes made in Emacs trunk
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 19 Nov 2012 22:11:15 +0000 (22:11 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 19 Nov 2012 22:11:15 +0000 (22:11 +0000)
commita37c5ae47930c15eb3e526bc608ca464dbb19808
tree3f33536e872077ce351a498dceedf3903480fb5c
parent52c9fb519860132aa3c0f7f58b2f39290f6901f1
Merge changes made in Emacs trunk

* color.el: Don't require cl.
  (color-complement): `caddr' -> `nth 2'.
* time-date.el (time-to-seconds): De-obsolete.
lisp/ChangeLog
lisp/color.el
lisp/time-date.el