Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

[bpt/emacs.git] / msdos / sed2x.inp

diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp
index d17dd85..0c8f16b 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  Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001-2014 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -21,7 +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/
 
-# arch-tag: 4a41c3ea-eb6c-4e17-8432-307516498e5a