From 30eabd7ad8328c1b6dfb6514685044e246bf0f04 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 3 Jul 2012 23:31:34 -0400 Subject: [PATCH] * lisp/xml.el (xml-name-regexp): Remove, redundant. Use xml-name-re. --- lisp/ChangeLog | 12 ++++++++---- lisp/xml.el | 7 ++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ff526afcee1..250aaa3bde4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-07-04 Stefan Monnier + + * xml.el (xml-name-regexp): Remove, redundant. Use xml-name-re. + 2012-07-03 Michael Albinus * 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. diff --git a/lisp/xml.el b/lisp/xml.el index 2595fd572f4..f2c1a703f88 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -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 -- 2.39.2