Merged in changes from CVS trunk.
authorKaroly Lorentey <lorentey@elte.hu>
Wed, 8 Dec 2004 22:20:27 +0000 (22:20 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Wed, 8 Dec 2004 22:20:27 +0000 (22:20 +0000)
commitfad2f6858075f49c4c8fd16f0535c287e3f14ac3
tree843a2ffe6caea6201877e3d2f1b6b954f47344b5
parent856dd47583918edd7987c13334703d3e7492d8f4
parentb11e88237593ff7556d8535305e8f342e6b61d66
Merged in changes from CVS trunk.

Patches applied:

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

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-271
35 files changed:
etc/TODO
lisp/faces.el
lisp/files.el
lisp/font-lock.el
lisp/progmodes/gdb-ui.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
lisp/term/x-win.el
lisp/textmodes/org.el
man/org.texi
src/Makefile.in
src/alloc.c
src/buildobj.lst
src/coding.c
src/coding.h
src/config.in
src/dispextern.h
src/emacs.c
src/fringe.c
src/indent.c
src/keyboard.c
src/keymap.c
src/lisp.h
src/lread.c
src/macterm.c
src/macterm.h
src/minibuf.c
src/sysdep.c
src/term.c
src/window.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xmenu.c