Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-6

Merge from emacs--cvs-trunk--0

Patches applied:

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

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog
Simple merge

diff --cc lisp/international/encoded-kb.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge