Mercurial > emacs
diff src/emacs.c @ 83286:9deb6323655c
Merged from miles@gnu.org--gnu-2005 (patch 59, 240-245)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-240
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-241
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-242
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-243
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-244
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-245
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-59
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-326
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Mon, 11 Apr 2005 12:40:15 +0000 |
| parents | 865f9b91fdbe 397fed153f02 |
| children | ad07ff6e4555 |
line wrap: on
line diff
--- a/src/emacs.c Fri Apr 08 16:25:22 2005 +0000 +++ b/src/emacs.c Mon Apr 11 12:40:15 2005 +0000 @@ -1806,8 +1806,8 @@ { "-d", "--display", 60, 1 }, { "-display", 0, 60, 1 }, /* Now for the options handled in startup.el. */ - { "-Q", "--bare-bones", 55, 0 }, - { "-bare-bones", 0, 55, 0 }, + { "-Q", "--quick", 55, 0 }, + { "-quick", 0, 55, 0 }, { "-q", "--no-init-file", 50, 0 }, { "-no-init-file", 0, 50, 0 }, { "-no-site-file", "--no-site-file", 40, 0 }, @@ -1818,6 +1818,8 @@ { "-i", "--icon-type", 15, 0 }, { "-itype", 0, 15, 0 }, { "-iconic", "--iconic", 15, 0 }, + { "-D", "--basic-display", 12, 0}, + { "--basic-display", 0, 12, 0}, { "-bg", "--background-color", 10, 1 }, { "-background", 0, 10, 1 }, { "-fg", "--foreground-color", 10, 1 },