Mercurial > emacs
view etc/schema/xhtml-applet.rnc @ 111679:33ed3cf8260b
Initial support for unified DVCS pull and merge.
* lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars.
(vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull)
(vc-bzr-merge-branch): New functions, implementing merge-branch
and pull operations.
* lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available.
Accept optional prefix arg meaning to prompt for a command.
(vc-update): Use vc-BACKEND-pull if available. Accept optional
prefix arg meaning to prompt for a command.
(vc-pull): Alias for vc-update.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 22 Nov 2010 20:15:08 -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