[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112340: Merge from emacs-24; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112340: Merge from emacs-24; up to r111343 |
Date: |
Sat, 20 Apr 2013 12:11:25 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112340 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-04-20 12:11:25 -0700
message:
Merge from emacs-24; up to r111343
modified:
doc/man/ChangeLog
doc/man/emacs.1
=== modified file 'doc/man/ChangeLog'
--- a/doc/man/ChangeLog 2013-03-11 16:31:55 +0000
+++ b/doc/man/ChangeLog 2013-04-20 19:11:25 +0000
@@ -1,3 +1,7 @@
+2013-04-20 Petr Hracek <address@hidden> (tiny change)
+
+ * emacs.1: Add some more command-line options. (Bug#14165)
+
2012-12-02 Kevin Ryde <address@hidden>
* etags.1: Mention effect of --declarations in Lisp.
=== modified file 'doc/man/emacs.1'
--- a/doc/man/emacs.1 2013-03-05 03:59:35 +0000
+++ b/doc/man/emacs.1 2013-04-20 19:11:25 +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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112340: Merge from emacs-24; up to r111343,
Glenn Morris <=