emacs 21.2 cvs tag?

emacs 21.2 cvs tag?

[Thien-Thi Nguyen]

i see from sampling about half a dozen files that there are cvs tags:

  EMACS_21_3
  EMACS_21_1

but no such "EMACS_21_2".  the 21.2 tarball is dated 2002-03-16 and i'm
inclined to infer EMACS_21_2 from around that time, but that seems a bit
imprecise.  does anyone remember the exact time?

thi

Re: emacs 21.2 cvs tag?

[David Kastrup]

Thien-Thi Nguyen <ttn@surf.glug.org> writes:

> i see from sampling about half a dozen files that there are cvs tags:
> 
>   EMACS_21_3
>   EMACS_21_1
> 
> but no such "EMACS_21_2".  the 21.2 tarball is dated 2002-03-16 and i'm
> inclined to infer EMACS_21_2 from around that time, but that seems a bit
> imprecise.  does anyone remember the exact time?

Time alone will not be sufficient: 21.2 was released from a branch.
I think it may be the RC21_1 branch.

-- 
David Kastrup, Kriemhildstr. 15, 44793 Bochum

Re: emacs 21.2 cvs tag?

[Thien-Thi Nguyen]

   From: David Kastrup <dak@gnu.org>
   Date: 20 Apr 2004 16:00:13 +0200

   Time alone will not be sufficient: 21.2 was released from a branch.

thanks for the tip.

thi

xml.el

[Alex Schroeder]

What do you think of the following patch?
I could install it if nobody objects.

It allows me to produce the following XML:

    <foaf:knows>
      <foaf:Person>
        <foaf:name>Sacha Chua</foaf:name>
        <foaf:homape>http://sacha.free.net.ph</foaf:homape>
        <foaf:mbox>sacha@free.net.ph</foaf:mbox>
        <rdfs:seeAlso rdf:resource="http://sacha.free.net.ph/notebook/xml/foaf.rdf"/>
      </foaf:Person>
    </foaf:knows>

Compare this with the old code:

    <foaf:knows>
      <foaf:Person>
        <foaf:name>Sacha Chua
        </foaf:name>
        <foaf:homape>http://sacha.free.net.ph
        </foaf:homape>
        <foaf:mbox>sacha@free.net.ph
        </foaf:mbox>
        <rdfs:seeAlso rdf:resource="http://sacha.free.net.ph/notebook/xml/foaf.rdf">
        </rdfs:seeAlso>
      </foaf:Person>
    </foaf:knows>

Differences:

1. For text nodes, the closing tag comes right after the text, not on
   a new line.  Example above: foaf:name.

2. For empty elements, we don't use separate open and close tags.
   Example above: rdfs:seeAlso.

I find the functionality very useful, btw, and don't think that we
need to call them "xml-debug-print" and "xml-debug-print-internal".  I
suggest "xml-print" with an optional argument indent-string defaulting
to the empty string.  The old names can stay as wrappers, if required.
I could send a second patch to do that.


2004-04-28  Alex Schroeder  <alex@gnu.org>

	* xml.el (xml-debug-print-internal): Fix handling of closing
          tags for text elements and empty elements.

Index: xml.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/xml.el,v
retrieving revision 1.33
diff -c -r1.33 xml.el
*** xml.el	16 Apr 2004 22:46:26 -0000	1.33
--- xml.el	28 Apr 2004 00:21:47 -0000
***************
*** 639,660 ****
        (insert ?\  (symbol-name (caar attlist)) "=\"" (cdar attlist) ?\")
        (setq attlist (cdr attlist)))
  
-     (insert ?>)
- 
      (setq tree (xml-node-children tree))
  
!     ;;  output the children
!     (dolist (node tree)
!       (cond
!        ((listp node)
! 	(insert ?\n)
! 	(xml-debug-print-internal node (concat indent-string "  ")))
!        ((stringp node) (insert node))
!        (t
! 	(error "Invalid XML tree"))))
  
!     (insert ?\n indent-string
! 	    ?< ?/ (symbol-name (xml-node-name xml)) ?>)))
  
  (provide 'xml)
  
--- 639,664 ----
        (insert ?\  (symbol-name (caar attlist)) "=\"" (cdar attlist) ?\")
        (setq attlist (cdr attlist)))
  
      (setq tree (xml-node-children tree))
  
!     (if (null tree)
! 	(insert ?/ ?>)
!       (insert ?>)
! 
!       ;;  output the children
!       (dolist (node tree)
! 	(cond
! 	 ((listp node)
! 	  (insert ?\n)
! 	  (xml-debug-print-internal node (concat indent-string "  ")))
! 	 ((stringp node) (insert node))
! 	 (t
! 	  (error "Invalid XML tree"))))
  
!       (when (not (and (null (cdr tree))
! 		      (stringp (car tree))))
! 	(insert ?\n indent-string))
!       (insert ?< ?/ (symbol-name (xml-node-name xml)) ?>))))
  
  (provide 'xml)

Re: xml.el

[Stefan Monnier]

> What do you think of the following patch?

Great.

> I find the functionality very useful, btw, and don't think that we
> need to call them "xml-debug-print" and "xml-debug-print-internal".  I
> suggest "xml-print" with an optional argument indent-string defaulting
> to the empty string.  The old names can stay as wrappers, if required.
> I could send a second patch to do that.

Or you could just install it.
The only problem with calling it `xml-print' is that people might complain
if the result is not correct, whereas with -debug- in the name, it's pretty
clear that it's not guaranteed to give XML-compliant results.


        Stefan

Re: emacs 21.2 cvs tag?

[Stefan Monnier]

> i see from sampling about half a dozen files that there are cvs tags:
>   EMACS_21_3
>   EMACS_21_1

> but no such "EMACS_21_2".  the 21.2 tarball is dated 2002-03-16 and i'm
> inclined to infer EMACS_21_2 from around that time, but that seems a bit
> imprecise.  does anyone remember the exact time?

I recommend you look at the "Release" message in the ChangeLog files.
That's how I reverse-engineered the EMACS_20_4 (IIRC).
BTW, it took some fine-tuning to get the right set of files (first,
an approximate date, then trying out a few nearby times to see what was
added just before/after and comparing it to the ChangeLog text until
it matches: the time was different for different dirs (and files), IIRC).


        Stefan

Re: emacs 21.2 cvs tag?

[Thien-Thi Nguyen]

   From: Stefan Monnier <monnier@iro.umontreal.ca>
   Date: 20 Apr 2004 10:34:58 -0400

   I recommend you look at the "Release" message in the ChangeLog files.

thanks for the tip.  i did:

  cvs update -D '2002-03-16 12:30 UTC' -r EMACS_21_1_RC
  ( cd lisp ; cvs update -r 2.7 subdirs.el )
  cvs tag EMACS_21_2

to verify, i unpacked emacs-21.2.tar.gz and did:

  diff -urbw -x .cvsignore -x CVS -x '*.elc' emacs-21.2 BASE

(BASE is the working directory for the previous commands.)  the result
was some harmless "Only in emacs-21.2/info" lines for generated info
files, and a total file mismatch for leim/Makefile.in, which i believe
is also harmless since leim/ is specially handled; please feel free to
suggest a better approach if one comes to mind.

thi

Re: emacs 21.2 cvs tag?

[Andreas Schwab]

Thien-Thi Nguyen <ttn@surf.glug.org> writes:

> (BASE is the working directory for the previous commands.)  the result
> was some harmless "Only in emacs-21.2/info" lines for generated info

The info files are not in CVS, so you can ignore them.

> files, and a total file mismatch for leim/Makefile.in, which i believe

You need to move leim/Makefile.in to noleim-Makefile.in before unpacking
the leim tarball.

Andreas.

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."