comparison src/emacs.c @ 83384:08b4dd6a6e87

Merged from miles@gnu.org--gnu-2005 (patch 578-592) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-578 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-579 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-580 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-581 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-582 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-583 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-584 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-585 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-586 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-587 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-588 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-589 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-590 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-591 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-592 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-424
author Karoly Lorentey <lorentey@elte.hu>
date Wed, 12 Oct 2005 16:14:04 +0000
parents 2a679c81f552 3733ed3530ec
children 0cd72d94a6c7
comparison
equal deleted inserted replaced
83383:2a679c81f552 83384:08b4dd6a6e87
310 --foreground-color, -fg COLOR window foreground color\n\ 310 --foreground-color, -fg COLOR window foreground color\n\
311 --fullheight, -fh make the first frame high as the screen\n\ 311 --fullheight, -fh make the first frame high as the screen\n\
312 --fullscreen, -fs make first frame fullscreen\n\ 312 --fullscreen, -fs make first frame fullscreen\n\
313 --fullwidth, -fw make the first frame wide as the screen\n\ 313 --fullwidth, -fw make the first frame wide as the screen\n\
314 --geometry, -g GEOMETRY window geometry\n\ 314 --geometry, -g GEOMETRY window geometry\n\
315 --icon-type, -i use picture of gnu for Emacs icon\n\ 315 --no-bitmap-icon, -nbi do not use picture of gnu for Emacs icon\n\
316 --iconic start Emacs in iconified state\n\ 316 --iconic start Emacs in iconified state\n\
317 --internal-border, -ib WIDTH width between text and main border\n\ 317 --internal-border, -ib WIDTH width between text and main border\n\
318 --line-spacing, -lsp PIXELS additional space to put between lines\n\ 318 --line-spacing, -lsp PIXELS additional space to put between lines\n\
319 --mouse-color, -ms COLOR mouse cursor color in Emacs window\n\ 319 --mouse-color, -ms COLOR mouse cursor color in Emacs window\n\
320 --name NAME title for initial Emacs frame\n\ 320 --name NAME title for initial Emacs frame\n\
1829 { "-no-site-file", "--no-site-file", 40, 0 }, 1829 { "-no-site-file", "--no-site-file", 40, 0 },
1830 { "-no-splash", "--no-splash", 40, 0 }, 1830 { "-no-splash", "--no-splash", 40, 0 },
1831 { "-u", "--user", 30, 1 }, 1831 { "-u", "--user", 30, 1 },
1832 { "-user", 0, 30, 1 }, 1832 { "-user", 0, 30, 1 },
1833 { "-debug-init", "--debug-init", 20, 0 }, 1833 { "-debug-init", "--debug-init", 20, 0 },
1834 { "-i", "--icon-type", 15, 0 }, 1834 { "-nbi", "--no-bitmap-icon", 15, 0 },
1835 { "-itype", 0, 15, 0 },
1836 { "-iconic", "--iconic", 15, 0 }, 1835 { "-iconic", "--iconic", 15, 0 },
1837 { "-D", "--basic-display", 12, 0}, 1836 { "-D", "--basic-display", 12, 0},
1838 { "-basic-display", 0, 12, 0}, 1837 { "-basic-display", 0, 12, 0},
1839 { "-bg", "--background-color", 10, 1 }, 1838 { "-bg", "--background-color", 10, 1 },
1840 { "-background", 0, 10, 1 }, 1839 { "-background", 0, 10, 1 },