summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2008-02-07 14:08:56 +0000
committerJan Djärv <jan.h.d@swipnet.se>2008-02-07 14:08:56 +0000
commit1540a61a8ba40d87c63d1a33959940a312e0673d (patch)
tree7b77f9fc14670bf14dcd9f20753c139c2183376e /src/emacs.c
parent2532f20ce7c6d57c386143e38479433780009665 (diff)
downloademacs-1540a61a8ba40d87c63d1a33959940a312e0673d.tar.gz
(USAGE3): Add --parent-id
(standard_args): Ditto.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 50230b653d2..6a2479fc37a 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -326,6 +326,7 @@ Display options:\n\
--title, -T TITLE title for initial Emacs frame\n\
--vertical-scroll-bars, -vb enable vertical scroll bars\n\
--xrm XRESOURCES set additional X resources\n\
+--parent-id XID set parent window\n\
--help display this help and exit\n\
--version output version information and exit\n\
\n"
@@ -1867,6 +1868,7 @@ struct standard_args standard_args[] =
{ "-title", 0, 10, 1 },
{ "-name", "--name", 10, 1 },
{ "-xrm", "--xrm", 10, 1 },
+ { "-parent-id", "--parent-id", 10, 1 },
{ "-r", "--reverse-video", 5, 0 },
{ "-rv", 0, 5, 0 },
{ "-reverse", 0, 5, 0 },