Revision: emacs--multi-tty--0--patch-344
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Sat May 14 00:59:23 CEST 2005
Standard-date: 2005-05-13 22:59:23 GMT
Modified-files: ChangeLog admin/FOR-RELEASE configure
    configure.in etc/ChangeLog etc/NEWS etc/TODO
    etc/TUTORIAL.pt_BR etc/TUTORIAL.translators
    lib-src/ChangeLog lib-src/make-docfile.c lisp/ChangeLog
    lisp/add-log.el lisp/calc/calc-help.el lisp/cus-edit.el
    lisp/dired.el lisp/dnd.el lisp/emacs-lisp/generic.el
    lisp/eshell/esh-mode.el lisp/files.el lisp/font-lock.el
    lisp/generic-x.el lisp/international/ccl.el
    lisp/international/characters.el
    lisp/international/code-pages.el
    lisp/international/codepage.el
    lisp/international/encoded-kb.el
    lisp/international/fontset.el
    lisp/international/isearch-x.el
    lisp/international/iso-ascii.el
    lisp/international/iso-cvt.el
    lisp/international/iso-transl.el
    lisp/international/ja-dic-cnv.el
    lisp/international/ja-dic-utl.el
    lisp/international/kinsoku.el lisp/international/kkc.el
    lisp/international/latexenc.el
    lisp/international/latin1-disp.el
    lisp/international/mule-cmds.el
    lisp/international/mule-conf.el
    lisp/international/mule-diag.el
    lisp/international/mule-util.el
    lisp/international/mule.el lisp/international/ogonek.el
    lisp/international/quail.el
    lisp/international/subst-jis.el
    lisp/international/swedish.el
    lisp/international/titdic-cnv.el
    lisp/international/ucs-tables.el
    lisp/international/utf-16.el
    lisp/international/utf-8.el lisp/mouse-sel.el
    lisp/obsolete/float.el lisp/obsolete/hilit19.el
    lisp/obsolete/rnews.el lisp/play/5x5.el
    lisp/play/animate.el lisp/play/blackbox.el
    lisp/play/decipher.el lisp/play/doctor.el
    lisp/play/fortune.el lisp/play/gamegrid.el
    lisp/play/gametree.el lisp/play/handwrite.el
    lisp/play/landmark.el lisp/play/life.el
    lisp/play/morse.el lisp/play/mpuz.el lisp/play/pong.el
    lisp/play/snake.el lisp/play/tetris.el lisp/play/zone.el
    lisp/progmodes/ada-mode.el lisp/progmodes/ada-stmt.el
    lisp/progmodes/cc-fonts.el lisp/progmodes/executable.el
    lisp/progmodes/gdb-ui.el lisp/progmodes/gud.el
    lisp/progmodes/inf-lisp.el lisp/progmodes/make-mode.el
    lisp/progmodes/sh-script.el lisp/startup.el
    lisp/term/mac-win.el lisp/term/sun.el
    lisp/term/tty-colors.el lisp/term/w32-win.el
    lisp/term/x-win.el lisp/term/xterm.el lispref/ChangeLog
    lispref/customize.texi lispref/elisp.texi
    lispref/keymaps.texi lispref/modes.texi
    lispref/processes.texi mac/ChangeLog mac/inc/config.h
    mac/inc/m-mac.h mac/inc/s-mac.h mac/inc/sys/time.h
    mac/makefile.MPW man/ChangeLog man/basic.texi
    man/building.texi man/frames.texi man/screen.texi
    src/ChangeLog src/emacs.c src/image.c src/keyboard.c
    src/mac.c src/macfns.c src/macmenu.c src/macselect.c
    src/macterm.c src/unexmacosx.c src/xfns.c src/xmenu.c
    src/xterm.c
New-patches: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-344
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-296
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-297
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-298
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-299
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-300
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-301
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-302
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-303
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-304
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-305
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-306
Summary: Merged from miles@gnu.org--gnu-2005 (patch 296-306)
Keywords: merge

Patches applied:

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

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

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

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

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

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

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

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

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

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

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