diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 13:10:15 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 13:10:15 -0500 |
| commit | 6d3d61134327fe63fe33f16cf75d160686fd57b6 (patch) | |
| tree | eccbb474b4f9fc08ce0c2443e4340054c8d93d11 /lisp/cedet/srecode/cpp.el | |
| parent | f80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff) | |
| download | emacs-6d3d61134327fe63fe33f16cf75d160686fd57b6.tar.gz emacs-6d3d61134327fe63fe33f16cf75d160686fd57b6.tar.bz2 emacs-6d3d61134327fe63fe33f16cf75d160686fd57b6.zip | |
* 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.
Diffstat (limited to 'lisp/cedet/srecode/cpp.el')
0 files changed, 0 insertions, 0 deletions