Allow the options specific to the win32 graphical port

to be silently ignored by the tty port, so that the
config file can be conveniently shared between the two.

diff --git a/src/options.c b/src/options.c
index 27f07478861b335f5186aaf7c18d3000a6f4c42d..1d0e7952c1b97779694e8bcc69925b1555320b76 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1802,6 +1802,20 @@ goodfruit:
                return;
        }
 #endif /* MSWIN_GRAPHICS */
+#ifdef WIN32CON
+       /* ignore the graphical win32 graphical options silently,
+        * so defaults.nh can be easily used by both tty and win32
+        */
+       if (match_optname(opts, "win32_map_mode",
+                               sizeof("win32_map_mode")-1, TRUE) ||
+           match_optname(opts, "win32_align_status",
+                               sizeof("win32_align_status")-1, TRUE) ||
+           match_optname(opts, "win32_align_message",
+                               sizeof("win32_align_message")-1, TRUE) ||
+           match_optname(opts, "win32_map_cliparound_margin",
+                               sizeof("win32_map_cliparound_margin")-1, TRUE))
+           return;
+#endif
 
        fullname = "windowtype";
        if (match_optname(opts, fullname, 3, TRUE)) {