diff options
author | Vibhav Pant <vibhavp@gmail.com> | 2017-01-30 18:35:43 +0530 |
---|---|---|
committer | Vibhav Pant <vibhavp@gmail.com> | 2017-01-30 18:35:43 +0530 |
commit | bf7f7c0d82a56ed1b76358657e74ca2833b19fe2 (patch) | |
tree | 90f357b4a735ca7c90d1881ef9948186b9f919df /lisp/xml.el | |
parent | 25d38a06eceb0853190a2d9acf53d85686f524bd (diff) | |
parent | 9c4dfdd1af9f97c6a8d7e922b68a39052116790c (diff) | |
download | emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.tar.gz emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.tar.bz2 emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.zip |
Merge remote-tracking branch 'origin/master' into feature/byte-switch
Diffstat (limited to 'lisp/xml.el')
-rw-r--r-- | lisp/xml.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/xml.el b/lisp/xml.el index cd801be3083..be2ac96f264 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -646,8 +646,10 @@ surpassed `xml-entity-expansion-limit'")))) (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-*"))) |