From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 27 Feb 2015 14:20:56 +0000 (+0200)
Subject: Documentation followup for daemon mode on MS-Windows
X-Git-Tag: emacs-25.0.90~2564^2~275
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2a590d4e3dc692a97c1b53e015b945d84b4b4c7;p=emacs.git

Documentation followup for daemon mode on MS-Windows

 doc/lispref/os.texi (Startup Summary):
 doc/lispref/display.texi (Window Systems): Mention peculiarities of daemon
 mode on MS-Windows.

 etc/NEWS: Mention the new support for daemon mode on MS-Windows.
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 285c725caef..bff469a5188 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* os.texi (Startup Summary):
+	* display.texi (Window Systems): Mention peculiarities of daemon
+	mode on MS-Windows.
+
 2015-02-11  Martin Rudalics  <rudalics@gmx.at>
 
 	* frames.texi (Size Parameters): Update description of
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index b09b82a6724..5dd74d25e8f 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -6728,8 +6728,9 @@ Emacs is displaying the frame on a character-based terminal.
 This variable holds the value of @code{window-system} used for the
 first frame created by Emacs during startup.  (When Emacs is invoked
 with the @option{--daemon} option, it does not create any initial
-frames, so @code{initial-window-system} is @code{nil}.  @xref{Initial
-Options, daemon,, emacs, The GNU Emacs Manual}.)
+frames, so @code{initial-window-system} is @code{nil}, except on
+MS-Windows, where it is still @code{w32}.  @xref{Initial Options,
+daemon,, emacs, The GNU Emacs Manual}.)
 @end defvar
 
 @defun window-system &optional frame
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 46df0e78928..4df4a597ea6 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -244,8 +244,9 @@ options were specified.
 
 @item
 If the option @code{--daemon} was specified, it calls
-@code{server-start} and detaches from the controlling terminal.
-@xref{Emacs Server,,, emacs, The GNU Emacs Manual}.
+@code{server-start}, and on Posix systems also detaches from the
+controlling terminal.  @xref{Emacs Server,,, emacs, The GNU Emacs
+Manual}.
 
 @item
 If started by the X session manager, it calls
diff --git a/etc/NEWS b/etc/NEWS
index 3f88d3d297a..d5cb9474c83 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -756,6 +756,9 @@ Those features have been deprecated in Gtk+ for a long time.
 or Windows Server 2003.  The built binaries still run on all versions
 of Windows starting with Windows 9X.
 
++++
+** Emacs running on MS-Windows now supports the daemon mode.
+
 ** OS X 10.5 or older is no longer supported.
 
 ** OS X on PowerPC is no longer supported.