annotate 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 |
rev |
line source |
4703
|
1 /^VPATH *=/c\
|
|
2 # This works only in GNU make. Using the patterns avoids\
|
|
3 # object files being found by VPATH, and thus permits building\
|
|
4 # when $srcdir is configured itself.\
|
|
5 vpath %.c $(srcdir)\
|
|
6 vpath %.h $(srcdir)\
|
|
7 \
|
52401
|
8
|
|
9 # arch-tag: 56a64b50-e4e8-443a-960f-f13af0f1a545
|