3 files changed, 15 insertions, 28 deletions
diff --git a/generic/span-extent.el b/generic/span-extent.el
index 855824dd..eda3410d 100644
--- a/generic/span-extent.el
+++ b/generic/span-extent.el
@@ -25,14 +25,6 @@
   "Set the endpoints of SPAN to START, END."
   (set-extent-endpoints span start end))
 
-(defsubst set-span-start (span value)
-  "Set the start point of SPAN to VALUE."
-  (set-extent-endpoints span value (extent-end-position span)))
-
-(defsubst set-span-end (span value)
-  "Set the end point of SPAN to VALUE."
-  (set-extent-endpoints span (extent-start-position span) value))
-
 (defsubst set-span-property (span name value)
   "Set SPAN's property NAME to VALUE."
   (set-extent-property span name value))
@@ -70,10 +62,6 @@
   "Apply function FN to all spans between START and END with property PROP set"
   (mapcar-extents fn nil (current-buffer) start end  nil prop val))
 
-(defsubst delete-spans (start end prop)
-  "Delete all spans between START and END with property PROP set."
-  (mapcar-spans 'delete-span start end prop))
-
 (defsubst span-at (pt prop)
   "Return the smallest SPAN at point PT with property PROP."
   (extent-at pt nil prop))
diff --git a/generic/span-overlay.el b/generic/span-overlay.el
index 313eca19..0abf2cef 100644
--- a/generic/span-overlay.el
+++ b/generic/span-overlay.el
@@ -227,23 +227,10 @@ Re-attaches SPAN if it was removed from the buffer."
   (move-overlay span start end)
   (add-span span))
 
-(defsubst set-span-start (span value)
-  "Set the start point of SPAN to VALUE."
-  (set-span-endpoints span value (span-end span)))
-
-;; This doesn't affect invariant:
-(defsubst set-span-end (span value)
-  "Set the end point of SPAN to VALUE."
-  (set-span-endpoints span (span-start span) value))
-
 (defsubst mapcar-spans (fn start end prop &optional val)
   "Apply function FN to all spans between START and END with property PROP set"
   (mapcar fn (spans-at-region-prop start end prop val)))
 
-(defsubst delete-spans (start end prop)
-  "Delete all spans between START and END with property PROP set."
-  (mapcar-spans 'delete-span start end prop))
-
 (defun map-spans-aux (f l)
   (cond (l (cons (funcall f l) (map-spans-aux f (span-property l 'before))))
 	(t ())))
diff --git a/generic/span.el b/generic/span.el
index 92b57a89..eb609f39 100644
--- a/generic/span.el
+++ b/generic/span.el
@@ -16,12 +16,24 @@
 	 (require 'span-overlay))))
 
 ;;
-;; Generic functions built on low-level abstract ones
-;;
+;; Generic functions built on low-level concrete ones.
+;; 
+
+(defsubst delete-spans (start end prop)
+  "Delete all spans between START and END with property PROP set."
+  (mapcar-spans 'delete-span start end prop))
 
-(defun span-property-safe (span name)
+(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)
+  "Set the start point of SPAN to VALUE."
+  (set-span-endpoints span value (span-end span)))
+
+(defsubst set-span-end (span value)
+  "Set the end point of SPAN to VALUE."
+  (set-span-endpoints span (span-start span) value))
+
 (provide 'span)
 ;; span.el ends here.