]> code.delx.au - gnu-emacs/commitdiff
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-2
authorMiles Bader <miles@gnu.org>
Thu, 19 Jan 2006 07:11:42 +0000 (07:11 +0000)
committerMiles Bader <miles@gnu.org>
Thu, 19 Jan 2006 07:11:42 +0000 (07:11 +0000)
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (base, patch 1-3)

   - tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704
   - Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0  (patch 700-704)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: lisp/cus-edit.el (customize-rogue): Minor doc fix.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 185-186)

   - Merge from emacs--cvs-trunk--0
   - Update from CVS

1  2 
etc/NEWS
lisp/ChangeLog
lisp/bindings.el
lisp/faces.el
lisp/font-lock.el
lisp/gnus/gnus-start.el
lisp/gnus/message.el
lisp/international/mule.el
lisp/textmodes/sgml-mode.el
src/ChangeLog
src/frame.c

diff --cc etc/NEWS
Simple merge
diff --cc lisp/ChangeLog
Simple merge
Simple merge
diff --cc lisp/faces.el
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/frame.c
Simple merge