Mercurial > emacs
view etc/schema/xhtml-applet.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
# Applet Module applet = element applet { applet.attlist, # No restrictions on mixed content in TREX. param*, Flow.model } applet.attlist = Core.attrib, attribute alt { Text.datatype }, attribute archive { text }?, attribute code { text }?, attribute codebase { URI.datatype }?, attribute object { text }?, attribute height { Length.datatype }, attribute width { Length.datatype } Inline.class |= applet