diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-04-20 12:11:25 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-04-20 12:11:25 -0700 |
| commit | 61655fd96ce959e47ad8d047387e5585843fc789 (patch) | |
| tree | c398e5a4c21a169c0d6490b4044b37c7a4cbcae9 /doc | |
| parent | d7f5c16f47faa5764ae83a175e765066f55176f0 (diff) | |
| parent | 8c1f2bb0fa5eec3f052f81082ccde733e337eb40 (diff) | |
| download | emacs-61655fd96ce959e47ad8d047387e5585843fc789.tar.gz | |
Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/man/emacs.1 | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 8a2a90f7895..8b550dc4417 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2013-04-20 Petr Hracek <phracek@redhat.com> (tiny change) + + * emacs.1: Add some more command-line options. (Bug#14165) + 2012-12-02 Kevin Ryde <user42@zip.com.au> * etags.1: Mention effect of --declarations in Lisp. diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 3d0c5107adc..9149be2c523 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 |