[Emacs-diffs] Changes to emacs/lisp/xml.el

[Mark A . Hershberger]

Index: emacs/lisp/xml.el
diff -c emacs/lisp/xml.el:1.42 emacs/lisp/xml.el:1.43
*** emacs/lisp/xml.el:1.42      Thu Dec  2 07:19:03 2004
--- emacs/lisp/xml.el   Thu Dec  2 07:47:21 2004
***************
*** 179,185 ****
        xml)))
  
  
! (let* ((start-chars (concat ":[:alpha:]_"))
         (name-chars  (concat "-[:digit:]." start-chars))
  ;;[3]         S          ::=          (#x20 | #x9 | #xD | #xA)+
         (whitespace  "[ \t\n\r]"))
--- 179,185 ----
        xml)))
  
  
! (let* ((start-chars (concat "[:alpha:]:_"))
         (name-chars  (concat "-[:digit:]." start-chars))
  ;;[3]         S          ::=          (#x20 | #x9 | #xD | #xA)+
         (whitespace  "[ \t\n\r]"))
***************
*** 652,657 ****
--- 652,673 ----
                                               (xml-parse-fragment
                                                xml-validating-parser
                                                parse-ns))))))))
+          ;; skip parameter entity declarations
+          ((or (looking-at (concat "<!ENTITY[ \t\n\r]+%[ \t\n\r]+\\(" 
xml-name-re
+                                   "\\)[ \t\n\r]+SYSTEM[ \t\n\r]+"
+                                   "\\(\"[^\"]*\"\\|'[^']*'\\)[ \t\n\r]*>"))
+               (looking-at (concat "<!ENTITY[ \t\n\r]+"
+                                   "%[ \t\n\r]+"
+                                   "\\(" xml-name-re "\\)[ \t\n\r]+"
+                                   "PUBLIC[ \t\n\r]+"
+                                   "\\(\"[- 
\r\na-zA-Z0-9'()+,./:=?;address@hidden""
+                                   "\\|'[- 
\r\na-zA-Z0-9()+,./:=?;address@hidden'\\)[ \t\n\r]+"
+                                   "\\(\"[^\"]+\"\\|'[^']+'\\)"
+                                   "[ \t\n\r]*>")))
+           (goto-char (match-end 0)))
+          ;; skip parameter entities
+          ((looking-at (concat "%" xml-name-re ";"))
+           (goto-char (match-end 0)))
           (t
            (when xml-validating-parser
              (error "XML: (Validity) Invalid DTD item"))))))