Clean up span.el loading; make compat with bbdb.el in FSF

1 files changed, 7 insertions, 9 deletions

diff --git a/generic/span.el b/generic/span.el
index 59710e1f..5480d010 100644
--- a/generic/span.el
+++ b/generic/span.el
@@ -5,16 +5,14 @@
 ;;
 ;; $Id$
 
-
+;;
 ;; Spans are our abstraction of extents/overlays.
-;; 
+;;
 (eval-and-compile
-  (cond
-   ((fboundp 'make-extent)    (require 'span-extent))
-   ((fboundp 'make-overlay)   (require 'span-overlay))
-   (t			       
-    (error 
-     "Your Emacs version is not compatible with Proof General, sorry."))))
-
+  (cond ((string-match "XEmacs" emacs-version)  
+	 (require 'span-extent))
+ 	(t 
+	 (require 'span-overlay))))
+  
 (provide 'span)
 ;; span.el ends here.