Mercurial > emacs
comparison lisp/ChangeLog @ 112231:f4a73cf7587b
* 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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 13:10:15 -0500 |
| parents | 41f5a96a1e35 |
| children | 84917bd2a94e |
comparison
equal
deleted
inserted
replaced
| 112230:c1e8771a1716 | 112231:f4a73cf7587b |
|---|---|
| 1 2011-01-14 Stefan Monnier <monnier@iro.umontreal.ca> | |
| 2 | |
| 3 * vc/smerge-mode.el: Resolve comment conflicts more aggressively. | |
| 4 (smerge-resolve--normalize-re): New var. | |
| 5 (smerge-resolve--extract-comment, smerge-resolve--normalize): New funs. | |
| 6 (smerge-resolve): Use them. | |
| 7 * newcomment.el (comment-only-p): New function. | |
| 8 (comment-or-uncomment-region): Use it. | |
| 9 | |
| 1 2011-01-14 Brent Goodrick <bgoodr@gmail.com> (tiny change) | 10 2011-01-14 Brent Goodrick <bgoodr@gmail.com> (tiny change) |
| 2 | 11 |
| 3 * abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev | 12 * abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev |
| 4 table, get the value before switching to the output buffer. (Bug#7733) | 13 table, get the value before switching to the output buffer. (Bug#7733) |
| 5 | 14 |