Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10942
Modified Files:
nxml-mode.info nxml-mode.patch
Log Message:
New upstream version 20040910
Index: nxml-mode.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/nxml-mode.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nxml-mode.patch 8 Sep 2004 13:44:35 -0000 1.4
+++ nxml-mode.patch 10 Sep 2004 13:43:04 -0000 1.5
@@ -57,38 +57,6 @@
+ /bin/rm -f @PREFIX@/etc/${FLAVOR}/site-start.d/??${PACKAGE}.el
+fi
+
-diff -Naur nxml-mode-20040908/nxml-mode.el nxml-mode-20040908.fink/nxml-mode.el
---- nxml-mode-20040908/nxml-mode.el Wed Sep 8 19:46:29 2004
-+++ nxml-mode-20040908.fink/nxml-mode.el Wed Sep 8 23:25:59 2004
-@@ -1677,12 +1677,13 @@
- (cond ((<= (point) xmltok-start)
- (goto-char xmltok-start)
- (setq off nxml-attribute-indent)
-- (when xmltok-attributes
-- (let* ((att (car xmltok-attributes))
-- (start (xmltok-attribute-name-start att)))
-- (when (< start pos)
-- (goto-char start)
-- (setq off 0)))))
-+ (let ((atts (xmltok-merge-attributes)))
-+ (when atts
-+ (let* ((att (car atts))
-+ (start (xmltok-attribute-name-start att)))
-+ (when (< start pos)
-+ (goto-char start)
-+ (setq off 0))))))
- (t
- (back-to-indentation))))
- (+ (current-column) off)))
-@@ -1692,7 +1693,7 @@
- Otherwise return nil. START and END are the positions of the start
- and end of the attribute value containing POS. This expects the
- xmltok-* variables to be set up as by `xmltok-forward'."
-- (let ((atts xmltok-attributes)
-+ (let ((atts (xmltok-merge-attributes))
- att value-start value-end value-boundary)
- (while atts
- (setq att (car atts))
diff -Naur nxml-mode-20040908/nxml-mode.info nxml-mode-20040908.fink/nxml-mode.info
--- nxml-mode-20040908/nxml-mode.info Wed Sep 8 19:56:37 2004
+++ nxml-mode-20040908.fink/nxml-mode.info Wed Sep 8 22:24:17 2004
@@ -113,39 +81,3 @@
(unless (member dir load-path)
(setq load-path (cons dir load-path)))
(setq rng-schema-locating-files-default
-diff -Naur nxml-mode-20040908/xmltok.el nxml-mode-20040908.fink/xmltok.el
---- nxml-mode-20040908/xmltok.el Tue Aug 10 11:12:02 2004
-+++ nxml-mode-20040908.fink/xmltok.el Wed Sep 8 23:27:29 2004
-@@ -1877,6 +1877,32 @@
- (cons (vector type start end)
- xmltok-prolog-regions)))
-
-+(defun xmltok-merge-attributes ()
-+ "Return a list merging `xmltok-attributes' and 'xmltok-namespace-attributes'.
-+The members of the merged list are in order of occurrence in the
-+document. The list may share list structure with `xmltok-attributes'
-+and `xmltok-namespace-attributes'."
-+ (cond ((not xmltok-namespace-attributes)
-+ xmltok-attributes)
-+ ((not xmltok-attributes)
-+ xmltok-namespace-attributes)
-+ (t
-+ (let ((atts1 xmltok-attributes)
-+ (atts2 xmltok-namespace-attributes)
-+ merged)
-+ (while (and atts1 atts2)
-+ (cond ((< (xmltok-attribute-name-start (car atts1))
-+ (xmltok-attribute-name-start (car atts2)))
-+ (setq merged (cons (car atts1) merged))
-+ (setq atts1 (cdr atts1)))
-+ (t
-+ (setq merged (cons (car atts2) merged))
-+ (setq atts2 (cdr atts2)))))
-+ (setq merged (nreverse merged))
-+ (cond (atts1 (setq merged (nconc merged atts1)))
-+ (atts2 (setq merged (nconc merged atts2))))
-+ merged))))
-+
- ;;; Testing
-
- (defun xmltok-forward-test ()
Index: nxml-mode.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/editors/nxml-mode.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nxml-mode.info 8 Sep 2004 13:44:34 -0000 1.5
+++ nxml-mode.info 10 Sep 2004 13:43:04 -0000 1.6
@@ -1,12 +1,12 @@
Package: nxml-mode
-Version: 20040908
-Revision: 2
+Version: 20040910
+Revision: 1
Description: Emacs - Major mode for editing XML documents
License: GPL
Maintainer: Rohan Lloyd <[EMAIL PROTECTED]>
Depends: emacsen
Source: http://www.thaiopensource.com/download/%n-%v.tar.gz
-Source-MD5: 0ac67d24d51943934c04d03dbf78226f
+Source-MD5: 60f1d5ce273bdec3b88297b98c955e4c
PatchScript: <<
/usr/bin/sed 's|@PREFIX@|%p|g' <%a/%n.patch | /usr/bin/patch -p1
<<
@@ -40,10 +40,41 @@
InfoDocs: nxml-mode.info
Homepage: http://www.thaiopensource.com/nxml-mode/
DescDetail:<<
-This is a new major mode for GNU Emacs for editing XML documents. It
-supports editing well-formed XML documents and also provides
-schema-sensitive editing of XML documents using RELAX NG Compact
-Syntax.
+nXML mode is an addon for GNU Emacs, which makes GNU Emacs into a
+powerful XML editor. It's called nXML mode because in Emacs
+terminology addons that customize Emacs for editing text of a
+particular sort are called modes. Emacs already has a simple mode for
+XML; nXML mode is a new mode for XML.
+
+You should realize that Emacs with nXML mode differs from most XML
+editors in that XML is edited as text. What you see while you are
+editing is similar to what you would see if you were using a non-XML
+aware text editor. nXML mode does not attempt to conceal the XML
+tags. The big advantage is that you do not lose any functionality in
+moving from a text editor to nXML mode. All normal text editing
+commands can be used with nXML mode without restriction. nXML mode
+does not require that the XML document always be valid or even
+well-formed.
+
+nXML mode allows a schema to be associated with the XML document being
+edited. The schema is used to provide two key features:
+
+Continuous validation. nXML validates as you type, highlighting any
+invalid parts of your document.
+
+Completion. nXML can assist you in entering an element name, attribute
+name or data value by using information about what is allowed by the
+schema in that context.
+
+nXML mode uses Relax NG as its schema language. Relax NG has two
+alternative syntaxes: an XML syntax and a more readable, non-XML
+compact syntax. nXML mode supports the compact syntax. There are tools
+available to translate from DTDs and other schema languages into Relax
+NG compact syntax. Schemas for DocBook, XHTML, XSLT, RDF and RELAX NG
+are included in the nXML mode download.
+
+nXML mode can also be used without any schema. Features that work
+without any schema include support for inserting end-tags easily.
<<
DescUsage:<<
To use nxml-mode automatically for files with an extension of xml,
-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM.
Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
