bug#23440: 25.1.50; xml.el parses default namespace incorrectly

bug#23440: 25.1.50; xml.el parses default namespace incorrectly

[Eric Abrahamsen]

Apparently xml.el isn't doing quite the right thing when parsing xml
default namespaces. With the following text:

<multistatus xmlns="DAV:">
</multistatus>

M-: (xml-parse-region nil nil nil nil 'symbol-qnames)

Should return:

((DAV:multistatus ((... . "DAV:"))

But actually returns:

((multistatus ((http://www\.w3\.org/2000/xmlns/xmlns . "DAV:"))

A bit more background:

http://article.gmane.org/gmane.emacs.devel/203476/


In GNU Emacs 25.1.50.20 (i686-pc-linux-gnu, GTK+ Version 3.20.3)
 of 2016-05-01 built on pellet
Windowing system distributor 'The X.Org Foundation', version 11.0.11803000
Configured features:
XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GCONF GSETTINGS
NOTIFY ACL GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB
TOOLKIT_SCROLL_BARS GTK3 X11 LIBSYSTEMD

bug#23440: 25.1.50; xml.el parses default namespace incorrectly

[David Engster]

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

Eric Abrahamsen writes:
> Apparently xml.el isn't doing quite the right thing when parsing xml
> default namespaces. With the following text:
>
> <multistatus xmlns="DAV:">
> </multistatus>
>
> M-: (xml-parse-region nil nil nil nil 'symbol-qnames)
>
> Should return:
>
> ((DAV:multistatus ((... . "DAV:"))
>
> But actually returns:
>
> ((multistatus ((http://www\.w3\.org/2000/xmlns/xmlns . "DAV:"))

Should be fixed by the attached patch, but I need to test a bit more
before pushing it.

-David


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: xml-patch.diff --]
[-- Type: text/x-diff, Size: 604 bytes --]

diff --git a/lisp/xml.el b/lisp/xml.el
index 414300c..848a030 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -646,8 +646,10 @@ xml-parse-string
 (defun xml-parse-attlist (&optional xml-ns)
   "Return the attribute-list after point.
 Leave point at the first non-blank character after the tag."
-  (let ((attlist ())
-	end-pos name)
+  (let* ((attlist ())
+	 (symbol-qnames (eq (car-safe xml-ns) 'symbol-qnames))
+	 (xml-ns (if symbol-qnames (cdr xml-ns) xml-ns))
+	 end-pos name)
     (skip-syntax-forward " ")
     (while (looking-at (eval-when-compile
 			 (concat "\\(" xml-name-re "\\)\\s-*=\\s-*")))

bug#23440: 25.1.50; xml.el parses default namespace incorrectly

[Eric Abrahamsen]

On 05/04/16 08:06 AM, David Engster wrote:
> Eric Abrahamsen writes:
>> Apparently xml.el isn't doing quite the right thing when parsing xml
>> default namespaces. With the following text:
>>
>> <multistatus xmlns="DAV:">
>> </multistatus>
>>
>> M-: (xml-parse-region nil nil nil nil 'symbol-qnames)
>>
>> Should return:
>>
>> ((DAV:multistatus ((... . "DAV:"))
>>
>> But actually returns:
>>
>> ((multistatus ((http://www\.w3\.org/2000/xmlns/xmlns . "DAV:"))
>
> Should be fixed by the attached patch, but I need to test a bit more
> before pushing it.

This solved my org-caldav <--> radicale server sync problem.

Thanks,
Eric

bug#23440: Acknowledgement (25.1.50; xml.el parses default namespace incorrectly)

[Eric Abrahamsen]

I've been using this patch for months, with no ill effect. I hope
someone can push it soon!

bug#23440: Acknowledgement (25.1.50; xml.el parses default namespace incorrectly)

[Glenn Morris]

Eric Abrahamsen wrote:

> I've been using this patch for months, with no ill effect. I hope
> someone can push it soon!

Why don't you want to commit it yourself?

(If you are waiting for David, then note that AFAICS you did not cc him
on any of your replies.)

bug#23440: Acknowledgement (25.1.50; xml.el parses default namespace incorrectly)

[Eric Abrahamsen]

On 01/23/17 16:15 PM, Glenn Morris wrote:
> Eric Abrahamsen wrote:
>
>> I've been using this patch for months, with no ill effect. I hope
>> someone can push it soon!
>
> Why don't you want to commit it yourself?

General hesitation! I was given Gnu access for ELPA, not Emacs. I don't
have much experience with XML. But I'll review CONTRIBUTE and do it.

> (If you are waiting for David, then note that AFAICS you did not cc him
> on any of your replies.)

I forgot a cc was necessary. I'll ping him on this and see if he has any
new opinions. If not I'll just push it.

bug#23440: Acknowledgement (25.1.50; xml.el parses default namespace incorrectly)

[David Engster]

Eric Abrahamsen writes:
> I forgot a cc was necessary. I'll ping him on this and see if he has any
> new opinions. If not I'll just push it.

Thanks for the reminder, I completely forgot about that one. I just
pushed it with an accompanying test.

-David

bug#23440: Acknowledgement (25.1.50; xml.el parses default namespace incorrectly)

[Glenn Morris]

Eric Abrahamsen wrote:

> General hesitation! I was given Gnu access for ELPA, not Emacs.

Ah, ok! There's no way to tell that from the Savannah project membership page.
But in general I think you should feel free.

bug#23440: Acknowledgement (25.1.50; xml.el parses default namespace incorrectly)

[Eric Abrahamsen]

On 01/25/17 17:44 PM, Glenn Morris wrote:
> Eric Abrahamsen wrote:
>
>> General hesitation! I was given Gnu access for ELPA, not Emacs.
>
> Ah, ok! There's no way to tell that from the Savannah project membership page.
> But in general I think you should feel free.

In the future I will!