view msdos/sed2x.inp @ 65129:8303172e4c68

(smerge-remove-props): Make the args non-optional. (smerge-keep-n): Remove props. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-kill-current): Don't remove props anymore now that it's done in smerge-keep-n. (smerge-refined-change): New face. (smerge-refine-chopup-region, smerge-refine-highlight-change) (smerge-refine): New funs. (smerge-basic-map): Bind smerge-refine.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 25 Aug 2005 20:13:38 +0000
parents 3723093a21fd
children 067115a6e738 2d92f5c9d6ae
line wrap: on
line source

# -sed2x.inp------------------------------------------------------------
# Extra configuration script for src/config.h for DesqView/X
# ----------------------------------------------------------------------
#
# Copyright (C) 1994, 2002, 2003, 2004, 2005 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