]> code.delx.au - gnu-emacs/commitdiff
Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Tue, 1 May 2007 23:03:36 +0000 (23:03 +0000)
committerMiles Bader <miles@gnu.org>
Tue, 1 May 2007 23:03:36 +0000 (23:03 +0000)
Patches applied:

 * emacs--devo--0  (patch 713-725)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from emacs--rel--22: lisp/dired-x.el: Revert 2007-04-06 change.
   - Merge from gnus--rel--5.10

 * emacs--rel--22  (base, patch 1-5)

   - tag of emacs@sv.gnu.org/emacs--devo--0--patch-709
   - Sync to CVS tag EMACS_22_BRANCHPOINT
   - Sync to CVS branch EMACS_22_BASE
   - Update from CVS

 * gnus--rel--5.10  (patch 217)

   - Update from CVS

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

16 files changed:
1  2 
etc/MORE.STUFF
etc/NEWS
etc/PROBLEMS
etc/TODO
lisp/ChangeLog
lisp/international/mule.el
lisp/ldefs-boot.el
lisp/makefile.w32-in
lisp/progmodes/sh-script.el
lisp/textmodes/fill.el
src/ChangeLog
src/insdel.c
src/lisp.h
src/lread.c
src/xdisp.c
src/xmenu.c

diff --cc etc/MORE.STUFF
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc etc/PROBLEMS
Simple merge
diff --cc etc/TODO
Simple merge
diff --cc lisp/ChangeLog
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/insdel.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/lread.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xmenu.c
Simple merge