aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Hracek2013-04-09 18:39:02 -0700
committerGlenn Morris2013-04-09 18:39:02 -0700
commit8c1f2bb0fa5eec3f052f81082ccde733e337eb40 (patch)
tree0c581c3aa183866bc7fdb6317b626811ed264f73
parentf6ae5c5df1abb3f1aaa353c20c11c2e3c8fb0ae2 (diff)
downloademacs-8c1f2bb0fa5eec3f052f81082ccde733e337eb40.tar.gz
emacs-8c1f2bb0fa5eec3f052f81082ccde733e337eb40.zip
* doc/man/emacs.1: Add some more command-line options.
Fixes: debbugs:14165
-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 645f4a4031e..1898160220b 100644
--- a/doc/man/ChangeLog
+++ b/doc/man/ChangeLog
@@ -1,3 +1,7 @@
12013-04-10 Petr Hracek <phracek@redhat.com> (tiny change)
2
3 * emacs.1: Add some more command-line options. (Bug#14165)
4
12013-03-11 Glenn Morris <rgm@gnu.org> 52013-03-11 Glenn Morris <rgm@gnu.org>
2 6
3 * Version 24.3 released. 7 * Version 24.3 released.
diff --git a/doc/man/emacs.1 b/doc/man/emacs.1
index 4f7f8d28ada..b0f48f0176b 100644
--- a/doc/man/emacs.1
+++ b/doc/man/emacs.1
@@ -79,12 +79,22 @@ Go to the specified
79and 79and
80.IR column . 80.IR column .
81.TP 81.TP
82.BI \-\-chdir " directory"
83Change to
84.IR directory .
85.TP
82.BR \-q ", " \-\-no\-init\-file 86.BR \-q ", " \-\-no\-init\-file
83Do not load an init file. 87Do not load an init file.
84.TP 88.TP
89.BR \-nl ", " \-\-no\-shared\-memory
90Do not use shared memory.
91.TP
85.B \-\-no\-site\-file 92.B \-\-no\-site\-file
86Do not load the site-wide startup file. 93Do not load the site-wide startup file.
87.TP 94.TP
95.BR \-nsl ", " \-\-no\-site\-lisp
96Do not add site-lisp directories to load-path.
97.TP
88.B \-\-no\-desktop 98.B \-\-no\-desktop
89Do not load a saved desktop. 99Do not load a saved desktop.
90.TP 100.TP
@@ -325,6 +335,9 @@ in iconified state.
325.BR \-nbc ", " \-\-no\-blinking\-cursor 335.BR \-nbc ", " \-\-no\-blinking\-cursor
326Disable blinking cursor. 336Disable blinking cursor.
327.TP 337.TP
338.BI \-\-parent-id " xid"
339Set parent window.
340.TP
328.BR \-nw ", " \-\-no\-window\-system 341.BR \-nw ", " \-\-no\-window\-system
329Tell 342Tell
330.I Emacs 343.I Emacs