Merge from origin/emacs-24

[gnu-emacs] / msdos / sed2x.inp

diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp
index f3f06584e040fc54bd0617316f2598324a260ea1..90ab9dd60d566fb64eb12b52cf058b145041b686 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-2015 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -21,6 +20,5 @@
 /^#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/