aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2005-10-09 06:57:00 +0000
committerJan Djärv2005-10-09 06:57:00 +0000
commit55c9bfe532eb8ab382a5219963a76bf35e438095 (patch)
treeb1ad1a09250f5b75fb8c88f0cdf833ddec46a734 /src
parent84f2588006e1efea7ac2a7bed7198c216ea0f82c (diff)
downloademacs-55c9bfe532eb8ab382a5219963a76bf35e438095.tar.gz
emacs-55c9bfe532eb8ab382a5219963a76bf35e438095.zip
* emacs.c (standard_args): Removed options -i, -itype, --icon-type,
added -nb, --no-bitmap-icon.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 80281d4f26b..497cdd7943f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -311,7 +311,7 @@ Display options:\n\
311--fullscreen, -fs make first frame fullscreen\n\ 311--fullscreen, -fs make first frame fullscreen\n\
312--fullwidth, -fw make the first frame wide as the screen\n\ 312--fullwidth, -fw make the first frame wide as the screen\n\
313--geometry, -g GEOMETRY window geometry\n\ 313--geometry, -g GEOMETRY window geometry\n\
314--icon-type, -i use picture of gnu for Emacs icon\n\ 314--no-bitmap-icon, -nb do not use picture of gnu for Emacs icon\n\
315--iconic start Emacs in iconified state\n\ 315--iconic start Emacs in iconified state\n\
316--internal-border, -ib WIDTH width between text and main border\n\ 316--internal-border, -ib WIDTH width between text and main border\n\
317--line-spacing, -lsp PIXELS additional space to put between lines\n\ 317--line-spacing, -lsp PIXELS additional space to put between lines\n\
@@ -1828,8 +1828,7 @@ struct standard_args standard_args[] =
1828 { "-u", "--user", 30, 1 }, 1828 { "-u", "--user", 30, 1 },
1829 { "-user", 0, 30, 1 }, 1829 { "-user", 0, 30, 1 },
1830 { "-debug-init", "--debug-init", 20, 0 }, 1830 { "-debug-init", "--debug-init", 20, 0 },
1831 { "-i", "--icon-type", 15, 0 }, 1831 { "-nb", "--no-bitmap-icon", 15, 0 },
1832 { "-itype", 0, 15, 0 },
1833 { "-iconic", "--iconic", 15, 0 }, 1832 { "-iconic", "--iconic", 15, 0 },
1834 { "-D", "--basic-display", 12, 0}, 1833 { "-D", "--basic-display", 12, 0},
1835 { "-basic-display", 0, 12, 0}, 1834 { "-basic-display", 0, 12, 0},