Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de

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

diff --git a/msdos/sed1x.inp b/msdos/sed1x.inp
index aa755ee..638c945 100644 (file)
--- a/msdos/sed1x.inp
+++ b/msdos/sed1x.inp
@@ -2,8 +2,7 @@
 # Extra configuration script for src/makefile for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+# Copyright (C) 1994-1997, 1999-2012  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -27,8 +26,5 @@ s/DOC/DOC-X/g
 /^LIBS_SYSTEM *=/s!= *!= -lxext -lsys!
 /^MSDOS_X_OBJ *=/s!= *!= w16select.o termcap.o!
 /^FONT_OBJ *=/s!= *!= xfont.o!
-/^TOOLTIP_SUPPORT *=/s!= *!= ${lispsource}tooltip.elc!
-/^WINDOW_SUPPORT *=/s!= *!= $(BASE_WINDOW_SUPPORT) $(X_WINDOW_SUPPORT)!
 /^temacs *:/s!OLDXMENU!LIBXMENU!
 
-# arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19