bug#44285: 27.1; Invalid function: make-local-variable

[Ken Brown <kbrown@cornell.edu>]

[-- Attachment #1: Type: text/plain, Size: 694 bytes --]

On 10/28/2020 11:00 PM, noosphere@mailc.net wrote:
> Ken Brown on the Cygwin mailing list posted the following patch, which worked for me:
> 
> --- a/src/emacs.c
> +++ b/src/emacs.c
> @@ -170,7 +170,7 @@ #define MAIN_PROGRAM
>       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
> 

The full patch (with commit message) is attached.  Eli, is this OK for the 
emacs-27 branch?

Ken

[-- Attachment #2: 0001-Fix-failure-of-emacs-daemon-on-Cygwin.patch --]
[-- Type: text/plain, Size: 985 bytes --]

From 2d15296db112740bcb6e7fa5808b57f12a99e49e Mon Sep 17 00:00:00 2001
From: Ken Brown <kbrown@cornell.edu>
Date: Thu, 29 Oct 2020 08:45:29 -0400
Subject: [PATCH] Fix failure of 'emacs --daemon' on Cygwin

* src/emacs.c (DAEMON_MUST_EXEC): Define unconditionally on
Cygwin, not just if HAVE_NTGUI is defined.  This fixes the failure
of 'emacs --daemon' to start on the non-w32 Cygwin builds.
(Bug#44285)
---
 src/emacs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/emacs.c b/src/emacs.c
index 11dcdb33fe..3836f179ab 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -171,7 +171,7 @@ #define MAIN_PROGRAM
    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
 
-- 
2.28.0