From a3527e7eabc0e01498bbdb3af248894eb93c1b0d Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Fri, 8 Feb 2019 19:54:09 -0500
Subject: [PATCH] fix some merge fallout from 3.6.2 curses changes

---
 win/curses/cursmesg.c | 2 +-
 win/curses/cursmisc.c | 2 +-
 win/curses/curswins.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/win/curses/cursmesg.c b/win/curses/cursmesg.c
index d714f7968..4b000e6cf 100644
--- a/win/curses/cursmesg.c
+++ b/win/curses/cursmesg.c
@@ -281,7 +281,7 @@ curses_prev_mesg()
 
     wid = curses_get_wid(NHW_MENU);
     curses_create_nhmenu(wid);
-    Id = zeroany;
+    Id = cg.zeroany;
 
     for (count = 0; count < num_messages; count++) {
         mesg = get_msg_line(TRUE, count);
diff --git a/win/curses/cursmisc.c b/win/curses/cursmisc.c
index 92a7f6214..f0f638353 100644
--- a/win/curses/cursmisc.c
+++ b/win/curses/cursmisc.c
@@ -588,7 +588,7 @@ curses_view_file(const char *filename, boolean must_exist)
 
     wid = curses_get_wid(NHW_MENU);
     curses_create_nhmenu(wid);
-    Id = zeroany;
+    Id = cg.zeroany;
 
     while (dlb_fgets(buf, BUFSZ, fp) != NULL) {
         curses_add_menu(wid, NO_GLYPH, &Id, 0, 0, A_NORMAL, buf, FALSE);
diff --git a/win/curses/curswins.c b/win/curses/curswins.c
index a027c6c7d..88a67d1ef 100644
--- a/win/curses/curswins.c
+++ b/win/curses/curswins.c
@@ -502,7 +502,7 @@ curses_puts(winid wid, int attr, const char *text)
                        wid);
             return;
         }
-        Id = zeroany;
+        Id = cg.zeroany;
         curses_add_nhmenu_item(wid, NO_GLYPH, &Id, 0, 0, attr, text, FALSE);
     } else {
         waddstr(win, text);