]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f80aa5b) | patch
* lisp/vc/smerge-mode.el: Resolve comment conflicts more aggressively.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 14 Jan 2011 18:10:15 +0000 (13:10 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 14 Jan 2011 18:10:15 +0000 (13:10 -0500)
commit6d3d61134327fe63fe33f16cf75d160686fd57b6
treeeccbb474b4f9fc08ce0c2443e4340054c8d93d11tree | snapshot
parentf80aa5bfa90dff5cd75d1f40e4ababa3c86af7fbcommit | diff
* 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.
lisp/ChangeLog diff | blob | history
lisp/newcomment.el diff | blob | history
lisp/vc/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.