(smerge-auto-combine-max-separation): New var.
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 13 Feb 2008 15:10:57 +0000 (15:10 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 13 Feb 2008 15:10:57 +0000 (15:10 +0000)
commit02dfeba8a4ce93dadd7f5fa7f462fca12fdf28f8
tree6f3af2c8cce69d443906f83ed834d82ec34b4a2f
parent78dc87a23feb2a1a5d5dc0c2a5abc3a310493dcf
(smerge-auto-combine-max-separation): New var.
(smerge-auto-combine): New fun.
lisp/ChangeLog
lisp/smerge-mode.el
src/ccl.h
src/coding.h
src/font.h
src/lisp.h