aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2005-10-10 16:14:00 +0000
committerJan Djärv2005-10-10 16:14:00 +0000
commitf9e36a6dc971d61c8439f0a7d0b1df5a8e77f886 (patch)
tree2a6c79236f7e303723835fa9ba62cfe47e1f14c8 /src
parent92d22d4827437da88ec1ab4c6596fab97d5339a5 (diff)
downloademacs-f9e36a6dc971d61c8439f0a7d0b1df5a8e77f886.tar.gz
emacs-f9e36a6dc971d61c8439f0a7d0b1df5a8e77f886.zip
-nb changed to -nbi
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/emacs.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d9e64625393..dada003404a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12005-10-10 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2
3 * emacs.c (USAGE3, standard_args): -nb => -nbi
4
12005-10-10 Juanma Barranquero <lekktu@gmail.com> 52005-10-10 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * frame.c (Fredirect_frame_focus): Fix typos in docstring. 7 * frame.c (Fredirect_frame_focus): Fix typos in docstring.
diff --git a/src/emacs.c b/src/emacs.c
index 497cdd7943f..4eee9e0e534 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--no-bitmap-icon, -nb do not use picture of gnu for Emacs icon\n\ 314--no-bitmap-icon, -nbi 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,7 +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 { "-nb", "--no-bitmap-icon", 15, 0 }, 1831 { "-nbi", "--no-bitmap-icon", 15, 0 },
1832 { "-iconic", "--iconic", 15, 0 }, 1832 { "-iconic", "--iconic", 15, 0 },
1833 { "-D", "--basic-display", 12, 0}, 1833 { "-D", "--basic-display", 12, 0},
1834 { "-basic-display", 0, 12, 0}, 1834 { "-basic-display", 0, 12, 0},