diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-11-02 09:27:40 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-11-02 09:27:40 -0800 |
| commit | 018e0c36fbae6570e58a95d2ac47c0577a496f91 (patch) | |
| tree | 058be5b8f0a5145d8739e240058c37d1d267afbf /src/emacs.c | |
| parent | e654b41c6f9eae424736bc8845d92b9dd97ccd3e (diff) | |
| parent | 1fc9de4b81ceacabef6aafe48ecaabaf76f34bb2 (diff) | |
| download | emacs-018e0c36fbae6570e58a95d2ac47c0577a496f91.tar.gz | |
Merge from origin/emacs-27
1fc9de4b81 Improve reproducibility of generated -pkg.el files
da6234e2df Make sure pixel sizes are zero when setting window size fo...
2d15296db1 Fix failure of 'emacs --daemon' on Cygwin
8abce5b0c6 CC Mode: Only recognize foo (*bar) as a function pointer w...
85d1d8d768 Fix NEWS entry for fix of Bug#44080
2443b15a91 * src/buffer.c (syms_of_buffer) <fill-column>: Improve doc...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c index e9e9661c398..172e4607694 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -170,7 +170,7 @@ static uintmax_t heap_bss_diff; We mark being in the exec'd process by a daemon name argument of form "--daemon=\nFD0,FD1\nNAME" where FD are the pipe file descriptors, NAME is the original daemon name, if any. */ -#if defined NS_IMPL_COCOA || (defined HAVE_NTGUI && defined CYGWIN) +#if defined NS_IMPL_COCOA || defined CYGWIN # define DAEMON_MUST_EXEC #endif |