aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorMark Laws2015-02-27 12:43:30 +0200
committerEli Zaretskii2015-02-27 12:43:30 +0200
commit805fe507087b9675a010a30a8a8840587ffdf5be (patch)
tree9b91858096495590692d1f5fe814cb64d9712f8b /nt
parent6ef14349fa73922473ba8202e256f20e17661b25 (diff)
downloademacs-805fe507087b9675a010a30a8a8840587ffdf5be.tar.gz
emacs-805fe507087b9675a010a30a8a8840587ffdf5be.zip
Support daemon mode on MS-Windows (bug#19688)
src/emacs.c <w32_daemon_event> [WINDOWSNT]: New global var. (main) [WINDOWSNT]: Initialize it to NULL. Create the event to signal clients we are ready for connections. (Fdaemon_initialized): Use DAEMON_RUNNING. [WINDOWSNT]: MS-Windows specific code to signal clients we are ready for connections. src/lisp.h (DAEMON_RUNNING): New macro, encapsulates Posix and MS-Windows conditions for running in daemon mode. src/minibuf.c (read_minibuf): Use DAEMON_RUNNING. src/keyboard.c (kbd_buffer_get_event): Use DAEMON_RUNNING. src/dispnew.c (init_display) [WINDOWSNT]: Initialize frames/terminal even in daemon mode. nt/inc/ms-w32.h (W32_DAEMON_EVENT): New macro. lib-src/emacsclient.c (decode_options) [WINDOWSNT]: Don't reject empty arguments for --alternate-editor. (print_help_and_exit) [WINDOWSNT]: Don't refrain from advertising empty arguments for --alternate-editor. (start_daemon_and_retry_set_socket) [WINDOWSNT]: MS-Windows specific code to start Emacs in daemon mode and wait for it to be ready for client connections. lisp/server.el (server-process-filter): Force GUI frames on MS-Windows in daemon mode, even if a TTY frame was requested. lisp/frameset.el (frameset-keep-original-display-p): Don't assume windows-nt cannot be in daemon mode. lisp/frame.el (window-system-for-display): Don't assume windows-nt cannot be in daemon mode.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog5
-rw-r--r--nt/inc/ms-w32.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index b9966fb27d8..240f58c850b 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
12015-02-27 Mark Laws <mdl@60hz.org>
2
3 Support daemon mode on MS-Windows (bug#19688)
4 * inc/ms-w32.h (W32_DAEMON_EVENT): New macro.
5
12015-01-16 Eli Zaretskii <eliz@gnu.org> 62015-01-16 Eli Zaretskii <eliz@gnu.org>
2 7
3 * Makefile.in (AM_V_CC, am__v_CC_, am__v_CC_0, am__v_CC_1) 8 * Makefile.in (AM_V_CC, am__v_CC_, am__v_CC_0, am__v_CC_1)
diff --git a/nt/inc/ms-w32.h b/nt/inc/ms-w32.h
index adac2e3b4a1..c06ed588818 100644
--- a/nt/inc/ms-w32.h
+++ b/nt/inc/ms-w32.h
@@ -597,5 +597,7 @@ extern void _DebPrint (const char *fmt, ...);
597#endif 597#endif
598#endif 598#endif
599 599
600/* Event name for when emacsclient starts the Emacs daemon on Windows. */
601#define W32_DAEMON_EVENT "EmacsServerEvent"
600 602
601/* ============================================================ */ 603/* ============================================================ */