Mercurial > emacs
view msdos/sed3v2.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 | 148f72c0ee3b 2d92f5c9d6ae |
line wrap: on
line source
# -sed3v2.inp------------------------------------------------------------- # Configuration script for lib-src/makefile under DJGPP v2 # ---------------------------------------------------------------------- # # Copyright (C) 1996, 1998, 2000, 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. # # ---------------------------------------------------------------------- /^# DIST: /d /^SHELL *=/s/^/# / /^CC *=/s/=.*$/=gcc/ /-DVERSION=/s/@version@/\${version}/ /^configname *=/s/=.*$/=msdos/ /^archlibdir *=/s!=.*$!=/emacs/bin! /^bindir *=/s!=.*$!=/emacs/bin! /^libdir *=/s!=.*$!=/emacs/bin! /^srcdir=/s!srcdir=@srcdir@!srcdir := $(subst \\,/,$(shell command.com /c cd))! /^VPATH *=/s!=.*$!=.! /^CFLAGS *=/s!=.*$!=-O2 -g! /^C_SWITCH_SYSTEM *=/s!=.*$!=-DMSDOS! /^LOADLIBES *=/s!=.*$!=! /^ALLOCA *=/s!@ALLOCA@!! /^EXEEXT *=/s!@EXEEXT@!! /^INSTALLABLES/s/emacsclient *// s!^ \./! ! /^UTILITIES=/s/ wakeup// /^UTILITIES=/s/ movemail// /^UTILITIES=/s/ emacsserver// /^UTILITIES=/s/ timer// # arch-tag: 16f3be18-a45b-496c-b19c-e43840359de8