]> code.delx.au - gnu-emacs/commitdiff
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-43
authorMiles Bader <miles@gnu.org>
Mon, 13 Mar 2006 12:19:58 +0000 (12:19 +0000)
committerMiles Bader <miles@gnu.org>
Mon, 13 Mar 2006 12:19:58 +0000 (12:19 +0000)
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 148-156)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Remove nick-abbrevs stuff from rcirc.el
   - rcirc.el update from Ryan Yeske

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

   - Copy/update icons from Gnus trunk

21 files changed:
1  2 
etc/NEWS
etc/PROBLEMS
etc/TODO
lisp/ChangeLog
lisp/cus-start.el
lisp/international/mule.el
lisp/mail/rmail.el
lisp/simple.el
lisp/textmodes/ispell.el
src/ChangeLog
src/keymap.c
src/lisp.h
src/macfns.c
src/macterm.c
src/process.c
src/w32fns.c
src/w32term.c
src/window.c
src/xdisp.c
src/xfns.c
src/xterm.c

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
diff --cc lisp/simple.el
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/keymap.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/macfns.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/process.c
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/w32term.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfns.c
Simple merge
diff --cc src/xterm.c
Simple merge