]> git.eshelyaron.com Git - emacs.git/commit
* lisp/vc/smerge-mode.el: Avoid N² blow up in degenerate cases
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 27 Jul 2017 04:21:35 +0000 (00:21 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 27 Jul 2017 04:21:35 +0000 (00:21 -0400)
commit2d1d54d333735c0128fd31edb183a71298ef5cfc
tree66800cf607cd1820bfe92a671e8293a9c8d2f68a
parentea875060882a0de5c35574eb815dc45290cd2135
* lisp/vc/smerge-mode.el: Avoid N² blow up in degenerate cases

(smerge--refine-long-words): New var.
(smerge--refine-chopup-region): Use it.
lisp/vc/smerge-mode.el