comparison src/emacs.c @ 83285:865f9b91fdbe

Merged from [e-mail]--gnu-2005 (patch 56-58, 232-239) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-232 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-233 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-234 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-235 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-236 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-237 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-238 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-239 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-56 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-57 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-58 Collapse feature addition/removal within single ChangeLog entry git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-325

83284:360860a0006f

  { "-nl", "--no-loadup", 70, 0 },
  /* -d must come last before the options handled in startup.el.  */
  { "-d", "--display", 60, 1 },
  { "-display", 0, 60, 1 },
  /* Now for the options handled in startup.el.  */
  { "-q", "--no-init-file", 50, 0 },
  { "-no-init-file", 0, 50, 0 },
  { "-no-site-file", "--no-site-file", 40, 0 },
  { "-no-splash", "--no-splash", 40, 0 },
  { "-u", "--user", 30, 1 },

83285:865f9b91fdbe

  { "-nl", "--no-loadup", 70, 0 },
  /* -d must come last before the options handled in startup.el.  */
  { "-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", "--no-init-file", 50, 0 },
  { "-no-init-file", 0, 50, 0 },
  { "-no-site-file", "--no-site-file", 40, 0 },
  { "-no-splash", "--no-splash", 40, 0 },
  { "-u", "--user", 30, 1 },