Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org

diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog
index 8a2a90f..8b550dc 100644 (file)
--- 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 3d0c510..9149be2 100644 (file)
--- 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