# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1265916936 18000
# Node ID 6429fc34756ad39a1adbb83864f17df5c228b696
# Parent  741ff2bdfe796ffe21e32e31b01396c738ee7607
* subr.el (copy-overlay): Handle deleted overlays.

diff -r 741ff2bdfe79 -r 6429fc34756a lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 11 11:00:01 2010 -0500
+++ b/lisp/ChangeLog	Thu Feb 11 14:35:36 2010 -0500
@@ -1,5 +1,7 @@
 2010-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* subr.el (copy-overlay): Handle deleted overlays.
+
 	* man.el (Man-completion-table): Don't signal an error if we can't run
 	manual-program (bug#4056).
 
diff -r 741ff2bdfe79 -r 6429fc34756a lisp/subr.el
--- a/lisp/subr.el	Thu Feb 11 11:00:01 2010 -0500
+++ b/lisp/subr.el	Thu Feb 11 14:35:36 2010 -0500
@@ -2232,10 +2232,14 @@
 
 (defun copy-overlay (o)
   "Return a copy of overlay O."
-  (let ((o1 (make-overlay (overlay-start o) (overlay-end o)
-			  ;; FIXME: there's no easy way to find the
-			  ;; insertion-type of the two markers.
-			  (overlay-buffer o)))
+  (let ((o1 (if (overlay-buffer o)
+                (make-overlay (overlay-start o) (overlay-end o)
+                              ;; FIXME: there's no easy way to find the
+                              ;; insertion-type of the two markers.
+                              (overlay-buffer o))
+              (let ((o1 (make-overlay (point-min) (point-min))))
+                (delete-overlay o1)
+                o1))))
 	(props (overlay-properties o)))
     (while props
       (overlay-put o1 (pop props) (pop props)))