Revision: emacs--multi-tty--0--patch-493
Archive: lorentey@elte.hu--2004
Creator: Karoly Lorentey <lorentey@elte.hu>
Date: Fri Jan  6 17:13:05 CET 2006
Standard-date: 2006-01-06 16:13:05 GMT
Modified-files: ChangeLog configure configure.in etc/NEWS
    etc/orgcard.ps etc/orgcard.tex lisp/ChangeLog
    lisp/Makefile.in lisp/cus-edit.el lisp/cus-face.el
    lisp/cus-theme.el lisp/custom.el
    lisp/emacs-lisp/bytecomp.el lisp/font-lock.el
    lisp/info.el lisp/language/ind-util.el
    lisp/language/mlm-util.el lisp/mh-e/ChangeLog
    lisp/mh-e/mh-alias.el lisp/mh-e/mh-comp.el
    lisp/mh-e/mh-customize.el lisp/mh-e/mh-e.el
    lisp/mh-e/mh-funcs.el lisp/mh-e/mh-identity.el
    lisp/mh-e/mh-index.el lisp/mh-e/mh-init.el
    lisp/mh-e/mh-junk.el lisp/mh-e/mh-mime.el
    lisp/mh-e/mh-pick.el lisp/mh-e/mh-seq.el
    lisp/mh-e/mh-utils.el lisp/mouse.el
    lisp/progmodes/flymake.el lisp/simple.el lisp/startup.el
    lisp/term/mac-win.el lisp/textmodes/flyspell.el
    lisp/textmodes/org.el lisp/url/ChangeLog
    lisp/url/url-cookie.el lisp/url/url-history.el
    lisp/wid-edit.el lispref/ChangeLog lispref/markers.texi
    lispref/processes.texi man/ChangeLog man/custom.texi
    man/macos.texi man/org.texi src/.gdbinit src/ChangeLog
    src/callproc.c src/emacs.c src/gtkutil.c src/keymap.c
    src/mac.c src/macfns.c src/process.c src/window.h
New-patches: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-493
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
    miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
Summary: Merged from miles@gnu.org--gnu-2005 (patch 683-684)
Keywords: merge

Patches applied:

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

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