Mercurial > emacs
view etc/schema/xhtml-tgt.rnc @ 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 | 947277b5370c |
children |
line wrap: on
line source
# Target Module a.attlist &= target.attrib area.attlist &= target.attrib base.attlist &= target.attrib link.attrib &= target.attrib form.attlist &= target.attrib target.attrib = attribute target { text }?