[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/xml.el
From: |
Mark A . Hershberger |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/xml.el |
Date: |
Tue, 30 Nov 2004 23:51:26 -0500 |
Index: emacs/lisp/xml.el
diff -c emacs/lisp/xml.el:1.39 emacs/lisp/xml.el:1.40
*** emacs/lisp/xml.el:1.39 Thu Oct 7 18:13:43 2004
--- emacs/lisp/xml.el Wed Dec 1 04:45:08 2004
***************
*** 371,377 ****
(let ((pos (match-end 0)))
(unless (search-forward "]]>" nil t)
(error "XML: (Not Well Formed) CDATA section does not end anywhere in
the document"))
! (buffer-substring pos (match-beginning 0))))
;; DTD for the document
((looking-at "<!DOCTYPE")
(let ((dtd (xml-parse-dtd parse-ns)))
--- 371,379 ----
(let ((pos (match-end 0)))
(unless (search-forward "]]>" nil t)
(error "XML: (Not Well Formed) CDATA section does not end anywhere in
the document"))
! (concat
! (buffer-substring pos (match-beginning 0))
! (xml-parse-string))))
;; DTD for the document
((looking-at "<!DOCTYPE")
(let ((dtd (xml-parse-dtd parse-ns)))
***************
*** 703,709 ****
(let ((point 0)
children end-point)
! (while (string-match "&\\([^;]+\\);" string point)
(setq end-point (match-end 0))
(let* ((this-part (match-string 1 string))
(prev-part (substring string point (match-beginning 0)))
--- 705,711 ----
(let ((point 0)
children end-point)
! (while (string-match "&\\([^;]*\\);" string point)
(setq end-point (match-end 0))
(let* ((this-part (match-string 1 string))
(prev-part (substring string point (match-beginning 0)))
***************
*** 721,730 ****
(if c (string c))))
(entity
(cdr entity))
(t
(if xml-validating-parser
(error "XML: (Validity) Undefined entity `%s'"
! (match-string 1 this-part)))))))
(cond ((null children)
;; FIXME: If we have an entity that expands into XML, this won't
work.
--- 723,734 ----
(if c (string c))))
(entity
(cdr entity))
+ ((eq (length this-part) 0)
+ (error "XML: (Validity) No entity given"))
(t
(if xml-validating-parser
(error "XML: (Validity) Undefined entity `%s'"
! this-part))))))
(cond ((null children)
;; FIXME: If we have an entity that expands into XML, this won't
work.