Mercurial > emacs
view etc/schema/xhtml-script.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 | 38f93f3d00a2 |
children |
line wrap: on
line source
# Script Module script = element script { script.attlist, text } script.attlist = attribute charset { Charset.datatype }?, attribute type { ContentType.datatype }, attribute src { URI.datatype }?, attribute defer { "defer" }?, attribute xml:space { "preserve" }? noscript = element noscript { noscript.attlist, Block.model } noscript.attlist = Common.attrib head.content &= script* Script.class = noscript | script Inline.class |= Script.class Block.class |= Script.class