Mercurial > emacs

view msdos/sed1x.inp @ 65129:8303172e4c68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 695cf19ef79e
children 375f2633d815 d89b565897dd
line wrap: on
line source

# -sed1x.inp------------------------------------------------------------
# Extra configuration script for src/makefile for DesqView/X
# ----------------------------------------------------------------------
s!^	cd \${oldXMenudir}; \${MAKE}.*$!	${MAKE} -C ${oldXMenudir}.!
s!^	@true *$!	@rem!
s/DOC/DOC-X/g
#/^LIBXMENU *=/s!= *!= ../oldxmenu/!
/^temacs *:/s!OLDXMENU!LIBXMENU!

# arch-tag: 3e8a78f2-3dec-44f3-81f6-3785a562da19