Mercurial > emacs

view vpath.sed @ 54402:8bf3846fc7dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2004-03-15 Masatake YAMATO <jet@gyve.org> Added context menu support in smerge mode. Most of the part is written by Stefan Monnier. * smerge-mode.el (smerge-context-menu-map, smerge-context-menu): New keyman and menu. (smerge-text-properties): New function. (smerge-remove-props): New function. (smerge-popup-context-menu): New function. (smerge-resolve): Call `smerge-remove-props'. (smerge-keep-base, smerge-keep-other, smerge-keep-mine): Ditto. (smerge-keep-current): Ditto. (smerge-kill-current): New function. (smerge-match-conflict): Detect the file as `a same-diff conflict' if the filename is "ANCESTOR". Put text properties.
author Masatake YAMATO <jet@gyve.org>
date Mon, 15 Mar 2004 11:27:47 +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