Merge from emacs--cvs-trunk--0
authorMiles Bader <miles@gnu.org>
Sun, 2 Jan 2005 09:21:32 +0000 (09:21 +0000)
committerMiles Bader <miles@gnu.org>
Sun, 2 Jan 2005 09:21:32 +0000 (09:21 +0000)
commitd570d39f949427c4a5041375529c3748d72c6e3c
treef8f5e1b6b2dbe0315eb99d66a9f64ba91569bcc4
parentf1d34bcacd8dd9d730000f1fe8827559e1c89683
parentf405d1f5e5f2efdc1253e2e64c6b25ebec9ac1c5
Merge from emacs--cvs-trunk--0
lisp/ChangeLog
lisp/calc/calc-yank.el
lisp/faces.el
src/ChangeLog
src/dispextern.h
src/xdisp.c