HCoop Git - bpt/emacs.git/commit

Merged from miles@gnu.org--gnu-2005 (patch 307-312)

Patches applied:

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

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

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

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

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

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

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

author	Karoly Lorentey <lorentey@elte.hu>
	Mon, 16 May 2005 15:49:27 +0000 (15:49 +0000)
committer	Karoly Lorentey <lorentey@elte.hu>
	Mon, 16 May 2005 15:49:27 +0000 (15:49 +0000)
commit	35bc5d82600f330082298823f09f53259a90ea81
tree	328e8f1df7bcd3cb68f4dfa7de371543da885c89	tree \| snapshot (tar.gz zip)
parent	133fe4c8a2d944324dc2c9a42b01ab1d258ad49d	commit \| diff
parent	cc211a0ff8145e0814413e237bb5674d615968b7	commit \| diff

lisp/faces.el	diff1 \|	diff2 \|	blob \| history
lisp/files.el	diff1 \|	diff2 \|	blob \| history
lisp/font-lock.el	diff1 \|	diff2 \|	blob \| history
lisp/subr.el	diff1 \|	diff2 \|	blob \| history
src/alloc.c	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/fileio.c	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history