procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/xml.el (xml-name-regexp): Remove, redundant. Use xml-name-re.

Browse source
This commit is contained in:
Stefan Monnier 2012-07-03 23:31:34 -04:00
parent b3264a61ff
commit 30eabd7ad8
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2012-07-04 Stefan Monnier <monnier@iro.umontreal.ca>
* xml.el (xml-name-regexp): Remove, redundant. Use xml-name-re.
2012-07-03 Michael Albinus <michael.albinus@gmx.de>
* vc/ediff-diff.el (ediff-same-file-contents): Fix it for remote
@ -26,10 +30,10 @@
them to expand into markup as per XML spec.
(xml-default-ns): New variable.
(xml-entity-alist): Use XML spec definitions for lt and amp.
(xml-parse-region): Make first two arguments optional. Discard
text properties.
(xml-parse-tag-1): New function, spun off from xml-parse-tag. All
callers changed.
(xml-parse-region): Make first two arguments optional.
Discard text properties.
(xml-parse-tag-1): New function, spun off from xml-parse-tag.
All callers changed.
(xml-parse-tag): Call xml-parse-tag-1. For backward
compatibility, this function should not modify buffer contents.
(xml-parse-tag-1): Fix opening-tag regexp.

7
lisp/xml.el
View file

@ -294,9 +294,6 @@ If PARSE-NS is non-nil, then QNAMES are expanded."
"Syntax table used by `xml-parse-region'.")
;; XML [5]
;; Note that [:alpha:] matches all multibyte chars with word syntax.
(eval-and-compile
(defconst xml-name-regexp "[[:alpha:]_:][[:alnum:]._:-]*"))
;; Fixme: This needs re-writing to deal with the XML grammar properly, i.e.
;; document ::= prolog element Misc*
@ -588,7 +585,7 @@ Leave point at the first non-blank character after the tag."
end-pos name)
(skip-syntax-forward " ")
(while (looking-at (eval-when-compile
(concat "\\(" xml-name-regexp "\\)\\s-*=\\s-*")))
(concat "\\(" xml-name-re "\\)\\s-*=\\s-*")))
(setq end-pos (match-end 0))
(setq name (xml-maybe-do-ns (match-string-no-properties 1) nil xml-ns))
(goto-char end-pos)
@ -643,7 +640,7 @@ This follows the rule [28] in the XML specifications."
(error "XML: (Validity) Invalid DTD (expecting name of the document)"))
;; Get the name of the document
(looking-at xml-name-regexp)
(looking-at xml-name-re)
(let ((dtd (list (match-string-no-properties 0) 'dtd))
(xml-parameter-entity-alist xml-parameter-entity-alist)
(parameter-entity-re (eval-when-compile