Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-27
authorMiles Bader <miles@gnu.org>
Tue, 3 Aug 2004 00:03:00 +0000 (00:03 +0000)
committerMiles Bader <miles@gnu.org>
Tue, 3 Aug 2004 00:03:00 +0000 (00:03 +0000)
Merge from emacs--cvs-trunk--0

Patches applied:

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

1  2 
etc/NEWS
lisp/subr.el
src/abbrev.c
src/data.c
src/editfns.c
src/indent.c
src/keyboard.c
src/keymap.c
src/process.c
src/window.c

diff --cc etc/NEWS
Simple merge
diff --cc lisp/subr.el
Simple merge
diff --cc src/abbrev.c
Simple merge
diff --cc src/data.c
Simple merge
diff --cc src/editfns.c
Simple merge
diff --cc src/indent.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/keymap.c
Simple merge
diff --cc src/process.c
Simple merge
diff --cc src/window.c
Simple merge