From: Mark A. Hershberger <mah@everybody.org>
Date: Thu, 2 Dec 2004 06:53:43 +0000 (+0000)
Subject: Ensure that validity messages only show when xml-validating-parser is set.
X-Git-Tag: ttn-vms-21-2-B4~3475
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e0f11235576591958726f22a65cea7be8ab8660;p=emacs.git

Ensure that validity messages only show when xml-validating-parser is set.
---

diff --git a/lisp/xml.el b/lisp/xml.el
index ec048a440bd..cf1fd771d18 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -653,7 +653,8 @@ This follows the rule [28] in the XML specifications."
 						xml-validating-parser
 						parse-ns))))))))
 	   (t
-	    (error "XML: (Validity) Invalid DTD item")))))
+	    (when xml-validating-parser
+	      (error "XML: (Validity) Invalid DTD item")))))
       (if (looking-at "\\s-*]>")
 	  (goto-char (nth 1 (match-data)))))
     (nreverse dtd)))
@@ -724,9 +725,10 @@ This follows the rule [28] in the XML specifications."
 		    (entity
 		     (cdr entity))
 		    ((eq (length this-part) 0)
-		     (error "XML: (Validity) No entity given"))
+		     (when xml-validating-parser
+		       (error "XML: (Validity) No entity given")))
 		    (t
-		     (if xml-validating-parser
+		     (when xml-validating-parser
 			 (error "XML: (Validity) Undefined entity `%s'"
 				this-part))))))