From a6c290399b72088f07423c1326c54dbe5d8057cf Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Sat, 19 Jan 2019 11:04:26 -0500
Subject: [PATCH 1/3] Windows warning fix

---
 sys/winnt/windmain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/winnt/windmain.c b/sys/winnt/windmain.c
index 2b3b4ddcd..45e36174f 100644
--- a/sys/winnt/windmain.c
+++ b/sys/winnt/windmain.c
@@ -33,8 +33,8 @@ E void NDECL(mswin_destroy_reg);
 #endif
 #ifdef TTY_GRAPHICS
 extern void NDECL(backsp);
-extern void NDECL(clear_screen);
 #endif
+extern void NDECL(clear_screen);
 #undef E
 
 #ifdef PC_LOCKING

From 77bc07f579290eefbfeb946a786e73715fcd21bd Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Sun, 20 Jan 2019 15:56:40 +0200
Subject: [PATCH 2/3] Make demon gating show a message

This was both an accessibility and comprehensibility issue.
---
 doc/fixes36.2 | 1 +
 src/minion.c  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/doc/fixes36.2 b/doc/fixes36.2
index 141c13584..f4130f94d 100644
--- a/doc/fixes36.2
+++ b/doc/fixes36.2
@@ -342,6 +342,7 @@ the simulation of dual weapon combat when polymorphed into a form with more
 	used seconary weapon even when wearing a shield, or if it was silver
 	even when current shape couldn't handle silver, or if it was cursed;
 	cursed is allowed but weapon will be dropped, just like in two-weapon
+demons gated in other demons without any message
 
 
 Fixes to Post-3.6.1 Problems that Were Exposed Via git Repository
diff --git a/src/minion.c b/src/minion.c
index 973572184..7d4c6b9c8 100644
--- a/src/minion.c
+++ b/src/minion.c
@@ -143,6 +143,8 @@ struct monst *mon;
                 EMIN(mtmp)->renegade =
                     (atyp != u.ualign.type) ^ !mtmp->mpeaceful;
             }
+            if (is_demon(ptr) && canseemon(mtmp))
+                pline("%s appears in a cloud of smoke!", Amonnam(mtmp));
         }
         cnt--;
     }

From f6b9dc7d681390c0cbd4319053c9a59d1fd8a8fc Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Mon, 21 Jan 2019 11:54:03 +0200
Subject: [PATCH 3/3] Don't try to write a zero-length message

If the message history contains a zero-length message line, skip it,
as trying to write a zero-length string will make bwrite panic.

Happened only on X11. This is post-3.6.1 bug.
---
 src/save.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/save.c b/src/save.c
index 18465966d..75c1b1fd8 100644
--- a/src/save.c
+++ b/src/save.c
@@ -1240,6 +1240,8 @@ int fd, mode;
         while ((msg = getmsghistory(init)) != 0) {
             init = FALSE;
             msglen = strlen(msg);
+            if (msglen < 1)
+                continue;
             /* sanity: truncate if necessary (shouldn't happen);
                no need to modify msg[] since terminator isn't written */
             if (msglen > BUFSZ - 1)