Mercurial > emacs
view msdos/sed2x.inp @ 54903:922f49230ff5
(smerge-match-conflict): Try to do something sensible
for nested conflict markers.
(smerge-find-conflict): Better handle errors in smerge-match-conflict.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Thu, 15 Apr 2004 20:19:11 +0000 |
parents | 695cf19ef79e |
children | 3723093a21fd 375f2633d815 |
line wrap: on
line source
# -sed2x.inp------------------------------------------------------------ # Extra configuration script for src/config.h for DesqView/X # ---------------------------------------------------------------------- # # Copyright (C) 1994 # Free Software Foundation, Inc. # # This file is part of GNU Emacs. # # This file is free software; as a special exception, the author gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # # ---------------------------------------------------------------------- /^#undef HAVE_X_WINDOWS *$/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