aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2005-04-10 23:23:24 +0000
committerRichard M. Stallman2005-04-10 23:23:24 +0000
commita1716a5704f1e498eb83e9d9161cf01293660a2e (patch)
treec176a482b69bad85a5ca1ca78d328d5ea87798c1 /src
parent7fa57e4559cdf298bd392f75704c09790f04a62e (diff)
downloademacs-a1716a5704f1e498eb83e9d9161cf01293660a2e.tar.gz
emacs-a1716a5704f1e498eb83e9d9161cf01293660a2e.zip
(standard_args): Rename --bare-bones to --quick.
Add -D aka --basic-display.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 14feff34114..a1031891c45 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1806,8 +1806,8 @@ struct standard_args standard_args[] =
1806 { "-d", "--display", 60, 1 }, 1806 { "-d", "--display", 60, 1 },
1807 { "-display", 0, 60, 1 }, 1807 { "-display", 0, 60, 1 },
1808 /* Now for the options handled in startup.el. */ 1808 /* Now for the options handled in startup.el. */
1809 { "-Q", "--bare-bones", 55, 0 }, 1809 { "-Q", "--quick", 55, 0 },
1810 { "-bare-bones", 0, 55, 0 }, 1810 { "-quick", 0, 55, 0 },
1811 { "-q", "--no-init-file", 50, 0 }, 1811 { "-q", "--no-init-file", 50, 0 },
1812 { "-no-init-file", 0, 50, 0 }, 1812 { "-no-init-file", 0, 50, 0 },
1813 { "-no-site-file", "--no-site-file", 40, 0 }, 1813 { "-no-site-file", "--no-site-file", 40, 0 },
@@ -1818,6 +1818,8 @@ struct standard_args standard_args[] =
1818 { "-i", "--icon-type", 15, 0 }, 1818 { "-i", "--icon-type", 15, 0 },
1819 { "-itype", 0, 15, 0 }, 1819 { "-itype", 0, 15, 0 },
1820 { "-iconic", "--iconic", 15, 0 }, 1820 { "-iconic", "--iconic", 15, 0 },
1821 { "-D", "--basic-display", 12, 0},
1822 { "--basic-display", 0, 12, 0},
1821 { "-bg", "--background-color", 10, 1 }, 1823 { "-bg", "--background-color", 10, 1 },
1822 { "-background", 0, 10, 1 }, 1824 { "-background", 0, 10, 1 },
1823 { "-fg", "--foreground-color", 10, 1 }, 1825 { "-fg", "--foreground-color", 10, 1 },