]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Tue, 15 May 2007 07:17:13 +0000 (07:17 +0000)
committerMiles Bader <miles@gnu.org>
Tue, 15 May 2007 07:17:13 +0000 (07:17 +0000)
Patches applied:

 * emacs--devo--0  (patch 726-750)

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

 * emacs--rel--22  (patch 6-17)

   - Update from CVS
   - Update from CVS: src/xterm.c (XTread_socket): Revert last change.

 * gnus--rel--5.10  (patch 218-221)

   - Merge from emacs--devo--0, emacs--rel--22
   - Update from CVS

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

1  2 
configure
etc/NEWS
etc/TODO
lisp/ChangeLog
lisp/mail/rmail.el
lisp/startup.el
lisp/term/mac-win.el
lisp/textmodes/sgml-mode.el
src/ChangeLog
src/editfns.c
src/keymap.c

diff --cc configure
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc etc/TODO
Simple merge
diff --cc lisp/ChangeLog
Simple merge
Simple merge
diff --cc lisp/startup.el
Simple merge
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/editfns.c
Simple merge
diff --cc src/keymap.c
Simple merge