comparison src/emacs.c @ 90140:02f1dbc4a199

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-35 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 228-240) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 53-58) - Merge from emacs--cvs-trunk--0 - Update from CVS - Collapse feature addition/removal within single ChangeLog entry
author Miles Bader <miles@gnu.org>
date Sat, 09 Apr 2005 02:16:29 +0000
parents 30ad2795fdab 09dcb6ef852f
children 146c086df160
comparison
equal deleted inserted replaced
90139:e0d294b9b23e 90140:02f1dbc4a199
1812 { "-nl", "--no-loadup", 70, 0 }, 1812 { "-nl", "--no-loadup", 70, 0 },
1813 /* -d must come last before the options handled in startup.el. */ 1813 /* -d must come last before the options handled in startup.el. */
1814 { "-d", "--display", 60, 1 }, 1814 { "-d", "--display", 60, 1 },
1815 { "-display", 0, 60, 1 }, 1815 { "-display", 0, 60, 1 },
1816 /* Now for the options handled in startup.el. */ 1816 /* Now for the options handled in startup.el. */
1817 { "-Q", "--bare-bones", 55, 0 },
1818 { "-bare-bones", 0, 55, 0 },
1817 { "-q", "--no-init-file", 50, 0 }, 1819 { "-q", "--no-init-file", 50, 0 },
1818 { "-no-init-file", 0, 50, 0 }, 1820 { "-no-init-file", 0, 50, 0 },
1819 { "-no-site-file", "--no-site-file", 40, 0 }, 1821 { "-no-site-file", "--no-site-file", 40, 0 },
1820 { "-no-splash", "--no-splash", 40, 0 }, 1822 { "-no-splash", "--no-splash", 40, 0 },
1821 { "-u", "--user", 30, 1 }, 1823 { "-u", "--user", 30, 1 },