| commit | 6d3d61134327fe63fe33f16cf75d160686fd57b6 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Fri, 14 Jan 2011 18:10:15 +0000 (14 13:10 -0500) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Fri, 14 Jan 2011 18:10:15 +0000 (14 13:10 -0500) | ||
| tree | eccbb474b4f9fc08ce0c2443e4340054c8d93d11 | treesnapshot (tar.gz zip) |
| parent | f80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb | commitdiff |
* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.
(smerge-resolve--normalize-re): New var.
(smerge-resolve--extract-comment, smerge-resolve--normalize): New funs.
(smerge-resolve): Use them.
* lisp/newcomment.el (comment-only-p): New function.
(comment-or-uncomment-region): Use it.
(smerge-resolve--normalize-re): New var.
(smerge-resolve--extract-comment, smerge-resolve--normalize): New funs.
(smerge-resolve): Use them.
* lisp/newcomment.el (comment-only-p): New function.
(comment-or-uncomment-region): Use it.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/newcomment.el | diffblobblamehistory | |
| lisp/vc/smerge-mode.el | diffblobblamehistory |