]> code.delx.au - gnu-emacs/commitdiff
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-21
authorMiles Bader <miles@gnu.org>
Wed, 22 Feb 2006 06:54:10 +0000 (06:54 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 22 Feb 2006 06:54:10 +0000 (06:54 +0000)
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 97-112)

   - Update from CVS
   - Merge from erc--emacs--0
   - Update from CVS: src/regex.c (extend_range_table_work_area): Fix typo.
   - Merge from gnus--rel--5.10

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

   - Update from CVS

20 files changed:
1  2 
etc/NEWS
lisp/ChangeLog
lisp/gnus/rfc2047.el
lisp/isearch.el
lisp/loadup.el
lisp/progmodes/sh-script.el
lisp/textmodes/ispell.el
src/ChangeLog
src/Makefile.in
src/alloc.c
src/buffer.c
src/buffer.h
src/fringe.c
src/macterm.c
src/regex.c
src/window.c
src/xdisp.c
src/xfns.c
src/xmenu.c
src/xterm.c

diff --cc etc/NEWS
Simple merge
diff --cc lisp/ChangeLog
Simple merge
Simple merge
diff --cc lisp/isearch.el
Simple merge
diff --cc lisp/loadup.el
Simple merge
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/buffer.h
Simple merge
diff --cc src/fringe.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/regex.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/xmenu.c
Simple merge
diff --cc src/xterm.c
Simple merge