Mercurial > emacs
annotate autogen.sh @ 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 | 156cffa89b1b |
children | 4c90ffeb71c5 7b9e6639caa3 |
rev | line source |
---|---|
48482 | 1 #!/bin/sh |
2 | |
55111
156cffa89b1b
Update filename in "please read" message.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
3 echo "Please read INSTALL.CVS for instructions on how to build Emacs from CVS." |
48482 | 4 |
5 # Exit with failure, since people may have generic build scripts that | |
6 # try things like "autogen.sh && ./configure && make". | |
7 exit 1 | |
52401 | 8 |
9 # arch-tag: a123408c-fada-4bf7-98a0-a786cff918f0 |