Many compatibility updates, bug fixes, rearrangements for compilation.

1 files changed, 7 insertions, 9 deletions

diff --git a/lib/span.el b/lib/span.el
index 8e2c05f4..6fd8371d 100644
--- a/lib/span.el
+++ b/lib/span.el
@@ -5,12 +5,10 @@
 ;; License:   GPL (GNU GENERAL PUBLIC LICENSE)
 ;;
 ;; $Id$
-
-;; FIXME: NAMESPACE!!!!!!!
-
 ;;
 ;; Spans are our abstraction of extents/overlays.
 ;;
+
 (eval-and-compile
   (cond ((string-match "XEmacs" emacs-version)  
 	 (require 'span-extent))
@@ -21,21 +19,21 @@
 ;; Generic functions built on low-level concrete ones.
 ;; 
 
-(defsubst delete-spans (start end prop)
+(defsubst span-delete-spans (start end prop)
   "Delete all spans between START and END with property PROP set."
-  (mapcar-spans 'delete-span start end prop))
+  (span-mapcar-spans 'span-delete start end prop))
 
 (defsubst span-property-safe (span name)
   "Like span-property, but return nil if SPAN is nil."
   (and span (span-property span name)))
   
-(defsubst set-span-start (span value)
+(defsubst span-set-start (span value)
   "Set the start point of SPAN to VALUE."
-  (set-span-endpoints span value (span-end span)))
+  (span-set-endpoints span value (span-end span)))
 
-(defsubst set-span-end (span value)
+(defsubst span-set-end (span value)
   "Set the end point of SPAN to VALUE."
-  (set-span-endpoints span (span-start span) value))
+  (span-set-endpoints span (span-start span) value))
 
 (provide 'span)
 ;; span.el ends here.