Revision: emacs--multi-tty--0--patch-325
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Fri Apr  8 18:25:22 CEST 2005
Standard-date: 2005-04-08 16:25:22 GMT
Renamed-files: lisp/fast-lock.el lisp/obsolete/fast-lock.el
    lisp/lazy-lock.el lisp/obsolete/lazy-lock.el
Modified-files: admin/FOR-RELEASE etc/ChangeLog etc/NEWS
    etc/TUTORIAL.cs etc/TUTORIAL.de etc/TUTORIAL.it
    etc/TUTORIAL.ja etc/TUTORIAL.translators leim/ChangeLog
    leim/quail/sgml-input.el lisp/ChangeLog lisp/ChangeLog.5
    lisp/add-log.el lisp/calc/calc-aent.el
    lisp/calendar/timeclock.el lisp/comint.el
    lisp/cus-edit.el lisp/dired.el lisp/ediff-init.el
    lisp/emacs-lisp/copyright.el
    lisp/emacs-lisp/easy-mmode.el lisp/ffap.el
    lisp/generic-x.el lisp/generic.el lisp/gnus/ChangeLog
    lisp/gnus/gnus-art.el lisp/gnus/gnus-delay.el
    lisp/gnus/gnus-demon.el lisp/gnus/message.el
    lisp/gnus/nnimap.el lisp/gnus/nnultimate.el lisp/ielm.el
    lisp/info.el lisp/progmodes/compile.el
    lisp/progmodes/sh-script.el lisp/progmodes/tcl.el
    lisp/simple.el lisp/startup.el lisp/term/mac-win.el
    lisp/term/xterm.el lisp/textmodes/org.el
    lisp/textmodes/tex-mode.el lisp/wdired.el
    lisp/wid-edit.el lispref/ChangeLog lispref/modes.texi
    mac/ChangeLog
    mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
    mac/src/Emacs.r man/ChangeLog man/cmdargs.texi
    man/dired.texi man/frames.texi src/ChangeLog
    src/ChangeLog.6 src/emacs.c src/mac.c src/macfns.c
    src/xdisp.c
New-patches: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-325
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-232
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-233
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-234
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-235
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-236
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-237
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-238
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-239
    miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-56
    miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-57
    miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-58
Summary: Merged from miles@gnu.org--gnu-2005 (patch 56-58, 232-239)
Keywords: merge

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-232
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-233
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-234
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-235
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-236
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-237
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-238
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-239
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-56
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-57
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-58
   Collapse feature addition/removal within single ChangeLog entry