[Emacs-diffs] /srv/bzr/emacs/trunk r99487: * subr.el (copy-overlay): Handle deleted overlays.

[Stefan Monnier]

------------------------------------------------------------
revno: 99487
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-11 14:35:36 -0500
message:
  * subr.el (copy-overlay): Handle deleted overlays.
modified:
  lisp/ChangeLog
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-11 16:00:01 +0000
+++ b/lisp/ChangeLog    2010-02-11 19:35:36 +0000
@@ -1,5 +1,7 @@
 2010-02-11  Stefan Monnier  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2010-01-13 08:35:10 +0000
+++ b/lisp/subr.el      2010-02-11 19:35:36 +0000
@@ -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)))