Mercurial > emacs

diff lisp/ChangeLog @ 112231:f4a73cf7587b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Jan 14 13:06:07 2011 -0500
+++ b/lisp/ChangeLog	Fri Jan 14 13:10:15 2011 -0500
@@ -1,3 +1,12 @@
+2011-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* 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.
+	* newcomment.el (comment-only-p): New function.
+	(comment-or-uncomment-region): Use it.
+
 2011-01-14  Brent Goodrick  <bgoodr@gmail.com>  (tiny change)
 
 	* abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev