Merged in changes from CVS trunk.
authorKaroly Lorentey <lorentey@elte.hu>
Mon, 31 May 2004 13:48:26 +0000 (13:48 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Mon, 31 May 2004 13:48:26 +0000 (13:48 +0000)
commit190a56d6e02f134591a9d8861b8c4aa55bbec79b
treed1ea16845ca26efed987116be6e6b4fc6fc60000
parenta596810c6c3c3c2fd450717f5083a5ff5207d243
parent64df673db44e48ae6e2f57849f42961a78103075
Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-183
lisp/font-lock.el
lisp/subr.el
src/alloc.c
src/lisp.h
src/macterm.c
src/xdisp.c