From 76d6b0b2b1f039549d308a0d2c478a6b05869af9 Mon Sep 17 00:00:00 2001
From: David Aspinall <da@inf.ed.ac.uk>
Date: Thu, 24 Jul 2008 09:51:53 +0000
Subject: Merge changes from Version4Branch.

---
 generic/pg-xml.el | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'generic/pg-xml.el')

diff --git a/generic/pg-xml.el b/generic/pg-xml.el
index 3f9a0f37..46a98b2f 100644
--- a/generic/pg-xml.el
+++ b/generic/pg-xml.el
@@ -9,18 +9,10 @@
 ;; XML functions for Proof General.
 ;;
 
-(eval-when-compile
-  (require 'xml-fixed))			; for compile only
+(require 'xml)
 
 (require 'proof-utils) ;; for pg-internal-warning
 
-(cond
- ;; We want to find a good version of xml.el
- ((featurep 'xemacs)
-  (require 'xml-fixed))			;; XEmacs: used PG bundled fixed version
- (t					;; Otherwise use GNU Emacs distrib version.
-  (require 'xml)))
-
 (defalias 'pg-xml-error 'error)
 
 
-- 
cgit v1.2.3