Mercurial > emacs
view vpath.sed @ 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 | 695cf19ef79e |
children | 375f2633d815 |
line wrap: on
line source
/^VPATH *=/c\ # This works only in GNU make. Using the patterns avoids\ # object files being found by VPATH, and thus permits building\ # when $srcdir is configured itself.\ vpath %.c $(srcdir)\ vpath %.h $(srcdir)\ \ # arch-tag: 56a64b50-e4e8-443a-960f-f13af0f1a545