aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuri Linkov2005-03-05 04:34:59 +0000
committerJuri Linkov2005-03-05 04:34:59 +0000
commit49ca717b682f82e34b1e6f6e751fc0ab6cbb110c (patch)
tree4955f25ecf5a2809eaf1399139accd58989e8dbc /src
parentf245324110f8e6fc2534bbb6233a1be34a60e317 (diff)
downloademacs-49ca717b682f82e34b1e6f6e751fc0ab6cbb110c.tar.gz
emacs-49ca717b682f82e34b1e6f6e751fc0ab6cbb110c.zip
(USAGE1): Replace Info node name "command arguments"
with "emacs invocation". (USAGE3): Fix usage of `--color=MODE' which actually doesn't allow arguments `--color' and `MODE' to be separated by space. Add --no-blinking-cursor, -nbc. (standard_args): Add -nbc, --no-blinking-cursor.
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 eef51a56967..b2310c0a4c4 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -250,7 +250,7 @@ Run Emacs, the extensible, customizable, self-documenting real-time\n\
250display editor. The recommended way to start Emacs for normal editing\n\ 250display editor. The recommended way to start Emacs for normal editing\n\
251is with no options at all.\n\ 251is with no options at all.\n\
252\n\ 252\n\
253Run M-x info RET m emacs RET m command arguments RET inside Emacs to\n\ 253Run M-x info RET m emacs RET m emacs invocation RET inside Emacs to\n\
254read the main documentation for these command-line arguments.\n\ 254read the main documentation for these command-line arguments.\n\
255\n\ 255\n\
256Initialization options:\n\ 256Initialization options:\n\
@@ -296,7 +296,7 @@ Display options:\n\
296--background-color, -bg COLOR window background color\n\ 296--background-color, -bg COLOR window background color\n\
297--border-color, -bd COLOR main border color\n\ 297--border-color, -bd COLOR main border color\n\
298--border-width, -bw WIDTH width of main border\n\ 298--border-width, -bw WIDTH width of main border\n\
299--color MODE color mode for character terminals;\n\ 299--color, --color=MODE color mode for character terminals;\n\
300 MODE defaults to `auto', and can also\n\ 300 MODE defaults to `auto', and can also\n\
301 be `never', `auto', `always',\n\ 301 be `never', `auto', `always',\n\
302 or a mode name like `ansi8'\n\ 302 or a mode name like `ansi8'\n\
@@ -313,6 +313,7 @@ Display options:\n\
313--line-spacing, -lsp PIXELS additional space to put between lines\n\ 313--line-spacing, -lsp PIXELS additional space to put between lines\n\
314--mouse-color, -ms COLOR mouse cursor color in Emacs window\n\ 314--mouse-color, -ms COLOR mouse cursor color in Emacs window\n\
315--name NAME title for initial Emacs frame\n\ 315--name NAME title for initial Emacs frame\n\
316--no-blinking-cursor, -nbc disable blinking cursor\n\
316--reverse-video, -r, -rv switch foreground and background\n\ 317--reverse-video, -r, -rv switch foreground and background\n\
317--title, -T TITLE title for initial Emacs frame\n\ 318--title, -T TITLE title for initial Emacs frame\n\
318--vertical-scroll-bars, -vb enable vertical scroll bars\n\ 319--vertical-scroll-bars, -vb enable vertical scroll bars\n\
@@ -1824,6 +1825,7 @@ struct standard_args standard_args[] =
1824 { "-ib", "--internal-border", 10, 1 }, 1825 { "-ib", "--internal-border", 10, 1 },
1825 { "-ms", "--mouse-color", 10, 1 }, 1826 { "-ms", "--mouse-color", 10, 1 },
1826 { "-cr", "--cursor-color", 10, 1 }, 1827 { "-cr", "--cursor-color", 10, 1 },
1828 { "-nbc", "--no-blinking-cursor", 10, 0 },
1827 { "-fn", "--font", 10, 1 }, 1829 { "-fn", "--font", 10, 1 },
1828 { "-font", 0, 10, 1 }, 1830 { "-font", 0, 10, 1 },
1829 { "-fs", "--fullscreen", 10, 0 }, 1831 { "-fs", "--fullscreen", 10, 0 },