[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111343: * doc/man/emacs.1: Add some more command-line options.

[Glenn Morris]

------------------------------------------------------------
revno: 111343
fixes bug: http://debbugs.gnu.org/14165
author: Petr Hracek <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2013-04-09 18:39:02 -0700
message:
  * doc/man/emacs.1: Add some more command-line options.
modified:
  doc/man/ChangeLog
  doc/man/emacs.1

=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2013-03-11 02:35:23 +0000
+++ b/doc/man/ChangeLog 2013-04-10 01:39:02 +0000
@@ -1,3 +1,7 @@
+2013-04-10  Petr Hracek  <address@hidden>  (tiny change)
+
+       * emacs.1: Add some more command-line options.  (Bug#14165)
+
 2013-03-11  Glenn Morris  <address@hidden>
 
        * Version 24.3 released.

=== modified file 'doc/man/emacs.1'
--- a/doc/man/emacs.1   2013-03-05 03:53:34 +0000
+++ b/doc/man/emacs.1   2013-04-10 01:39:02 +0000
@@ -79,12 +79,22 @@
 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 @@
 .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