Merged from miles@gnu.org--gnu-2005 (patch 76-78)
authorKaroly Lorentey <lorentey@elte.hu>
Fri, 4 Feb 2005 15:36:07 +0000 (15:36 +0000)
committerKaroly Lorentey <lorentey@elte.hu>
Fri, 4 Feb 2005 15:36:07 +0000 (15:36 +0000)
Patches applied:

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

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

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

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

1  2 
lisp/international/mule-cmds.el
src/dispnew.c
src/macterm.c
src/xfaces.c
src/xfns.c
src/xmenu.c

Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/xfaces.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xmenu.c
Simple merge