Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Wed, 6 Sep 2006 07:30:39 +0000 (07:30 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 6 Sep 2006 07:30:39 +0000 (07:30 +0000)
Patches applied:

 * emacs--devo--0  (patch 423-426)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 131-133)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-109

1  2 
lisp/ChangeLog
lisp/simple.el
src/ChangeLog
src/editfns.c
src/lisp.h
src/window.c
src/xdisp.c

diff --cc lisp/ChangeLog
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/editfns.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge