git.eshelyaron.com Git - emacs.git/commit

Merged in changes from CVS trunk.

Patches applied:

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-720
   Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-721
   Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-722
   Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-723
   Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-724
   Update from CVS

* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-725
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-276

author	Karoly Lorentey <lorentey@elte.hu>
	Fri, 10 Dec 2004 15:24:54 +0000 (15:24 +0000)
committer	Karoly Lorentey <lorentey@elte.hu>
	Fri, 10 Dec 2004 15:24:54 +0000 (15:24 +0000)
commit	4b89585ee70a1f64543a5851f07cf7e2d89c5c62
tree	95c1775b6b83816892f010472c1a6d7e043b5ea7	tree \| snapshot
parent	97b977dbee4174dedbe2cfcb3e52d4e9c3c3cec9	commit \| diff
parent	593b351755c02c2f32c6717a026d12facf558ea8	commit \| diff

lisp/faces.el	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history