Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Thu, 6 Jul 2006 08:59:39 +0000 (08:59 +0000)
committerMiles Bader <miles@gnu.org>
Thu, 6 Jul 2006 08:59:39 +0000 (08:59 +0000)
commit6a46b0188332c8007c23014bd0ba97441be6abe8
treee6bad7efe8102d87934fbae8f1b34341cd4e4957
parent5ed089581a49f8f0eba2d911203ff5db57eac322
parent978db1472a9d4bbaafbc93b9176f7c409ac209bd
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 320-342)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - lisp/play/cookie1.el (cookie): Work properly when there's only one entry
   - Add note about "link" button-class to etc/TODO

 * gnus--rel--5.10  (patch 108-112)

   - Merge from emacs--devo--0
   - Clean up merge mistakes
   - Update from CVS
   - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
31 files changed:
etc/NEWS
etc/PROBLEMS
etc/TODO
lisp/ChangeLog
lisp/desktop.el
lisp/faces.el
lisp/info.el
lisp/international/mule-cmds.el
lisp/simple.el
lisp/term.el
lisp/term/mac-win.el
make-dist
src/.gdbinit
src/ChangeLog
src/dired.c
src/dispextern.h
src/dispnew.c
src/editfns.c
src/fileio.c
src/insdel.c
src/lread.c
src/macfns.c
src/macgui.h
src/macterm.c
src/w32console.c
src/w32fns.c
src/w32term.c
src/xdisp.c
src/xfaces.c
src/xfns.c
src/xterm.c