summaryrefslogtreecommitdiff
path: root/doc/man
diff options
context:
space:
mode:
authorPetr Hracek <phracek@redhat.com>2013-04-09 18:39:02 -0700
committerGlenn Morris <rgm@gnu.org>2013-04-09 18:39:02 -0700
commit8c1f2bb0fa5eec3f052f81082ccde733e337eb40 (patch)
tree0c581c3aa183866bc7fdb6317b626811ed264f73 /doc/man
parentf6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2 (diff)
* doc/man/emacs.1: Add some more command-line options.
Fixes: debbugs:14165
Diffstat (limited to 'doc/man')
-rw-r--r--doc/man/ChangeLog4
-rw-r--r--doc/man/emacs.113
2 files changed, 17 insertions, 0 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 645f4a4031..1898160220 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-10 Petr Hracek <phracek@redhat.com> (tiny change)
+
+ * emacs.1: Add some more command-line options. (Bug#14165)
+
2013-03-11 Glenn Morris <rgm@gnu.org>
* Version 24.3 released.
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 4f7f8d28ad..b0f48f0176 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -79,12 +79,22 @@ Go to the specified
and
.IR column .
.TP
+.BI \-\-chdir " directory"
+Change to
+.IR directory .
+.TP
.BR \-q ", " \-\-no\-init\-file
Do not load an init file.
.TP
+.BR \-nl ", " \-\-no\-shared\-memory
+Do not use shared memory.
+.TP
.B \-\-no\-site\-file
Do not load the site-wide startup file.
.TP
+.BR \-nsl ", " \-\-no\-site\-lisp
+Do not add site-lisp directories to load-path.
+.TP
.B \-\-no\-desktop
Do not load a saved desktop.
.TP
@@ -325,6 +335,9 @@ in iconified state.
.BR \-nbc ", " \-\-no\-blinking\-cursor
Disable blinking cursor.
.TP
+.BI \-\-parent-id " xid"
+Set parent window.
+.TP
.BR \-nw ", " \-\-no\-window\-system
Tell
.I Emacs