]> code.delx.au - gnu-emacs/commitdiff
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-74
authorMiles Bader <miles@gnu.org>
Fri, 29 Jul 2005 01:54:54 +0000 (01:54 +0000)
committerMiles Bader <miles@gnu.org>
Fri, 29 Jul 2005 01:54:54 +0000 (01:54 +0000)
Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 493-503)

   - Update from CVS
   - Update from CVS: lisp/startup.el (command-line): Fix typo.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 95-98)

   - Update from CVS

17 files changed:
1  2 
configure
configure.in
etc/NEWS
lisp/ChangeLog
lisp/isearch.el
lisp/ps-bdf.el
lisp/simple.el
lisp/startup.el
src/ChangeLog
src/alloc.c
src/bytecode.c
src/insdel.c
src/keyboard.c
src/lisp.h
src/macfns.c
src/w32fns.c
src/w32term.c

diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/ChangeLog
Simple merge
diff --cc lisp/isearch.el
Simple merge
diff --cc lisp/ps-bdf.el
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/bytecode.c
Simple merge
diff --cc src/insdel.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/macfns.c
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/w32term.c
Simple merge