Mercurial > emacs

view lispintro/Makefile.am @ 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
line wrap: on
line source

AUTOMAKE_OPTIONS = foreign 1.2
info_TEXINFOS = emacs-lisp-intro.texi
EXTRA_DIST = INSTALL MANIFEST README drawers.eps  \
	cons-1.eps cons-2.eps cons-2a.eps cons-3.eps    \
	cons-4.eps cons-5.eps lambda-1.eps lambda-2.eps lambda-3.eps

# arch-tag: 6a3e6d99-7aa2-479f-939c-5531165c5747