Merge from origin/emacs-25

[gnu-emacs] / msdos / sed2x.inp

diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp
index be26c8768c4ea720b9474f70087250ff9591e967..6efc1e7c422259676b0022cc1b62ae1a034a6101 100644 (file)
--- a/msdos/sed2x.inp
+++ b/msdos/sed2x.inp
@@ -2,8 +2,7 @@
 # Extra configuration script for src/config.h for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-#   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2016 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -17,10 +16,9 @@
 #
 # ----------------------------------------------------------------------
 /^#undef HAVE_X_WINDOWS *$/s/undef/define/
+/^#undef HAVE_WINDOW_SYSTEM *$/s/undef/define/
 /^#undef HAVE_X11 *$/s/undef/define/
 /^#undef HAVE_X_MENU *$/s/undef/define/
 /^#undef HAVE_XSCREENNUMBEROFSCREEN *$/s/undef/define/
-/^#undef HAVE_XSETWMPROTOCOLS *$/s/undef/define/
 /^#undef HAVE_SELECT *$/s/undef/define/
 
-# arch-tag: 4a41c3ea-eb6c-4e17-8432-307516498e5a