Merged from miles@gnu.org--gnu-2005 (patch 683-684)
commita8bf7299ee74781dd485c33c5eac20aee0f0ebef
authorKaroly Lorentey <lorentey@elte.hu>
Fri, 6 Jan 2006 16:13:05 +0000 (6 16:13 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Fri, 6 Jan 2006 16:13:05 +0000 (6 16:13 +0000)
treed2bc1c0d3d7a64a19945b5bb5d175cae37088bca
parente079ecf45241cc5d2904db7ede9592f9861bb9aa
parent600bc46cd52fbdedf592158c6b03ccfca88dbade
Merged from miles@gnu.org--gnu-2005 (patch 683-684)

Patches applied:

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

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

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-493
13 files changed:
configure
configure.in
lisp/cus-face.el
lisp/font-lock.el
lisp/simple.el
lisp/startup.el
lisp/term/mac-win.el
src/.gdbinit
src/callproc.c
src/emacs.c
src/keymap.c
src/process.c
src/window.h