(outline-discard-overlays): Don't use let inside a cycle.

diff --git a/lisp/textmodes/outline.el b/lisp/textmodes/outline.el
index bf15f6186f0dd730b5eaca94e01b5a1c006b18ef..f12518c4051fd4f3c7323bb842c4c63fe78f7617 100644 (file)
--- a/lisp/textmodes/outline.el
+++ b/lisp/textmodes/outline.el
@@ -415,22 +415,25 @@ If FLAG is nil then text is shown, while if FLAG is t the text is hidden."
   (if (< end beg)
       (setq beg (prog1 end (setq end beg))))
   (save-excursion
-    (let ((overlays (overlays-in beg end)))
+    (let ((overlays (overlays-in beg end))
+         o
+         o1)
       (while overlays
-       (let ((o (car overlays)))
-         (if (overlay-get o prop)
-             ;; Either push this overlay outside beg...end
-             ;; or split it to exclude beg...end
-             ;; or delete it entirely (if it is contained in beg...end).
-             (if (< (overlay-start o) beg)
-                 (if (> (overlay-end o) end)
-                     (let ((o1 (outline-copy-overlay o)))
-                       (move-overlay o1 (overlay-start o1) beg)
-                       (move-overlay o end (overlay-end o)))
-                   (move-overlay o (overlay-start o) beg))
+       (setq o (car overlays))
+       (if (overlay-get o prop)
+           ;; Either push this overlay outside beg...end
+           ;; or split it to exclude beg...end
+           ;; or delete it entirely (if it is contained in beg...end).
+           (if (< (overlay-start o) beg)
                (if (> (overlay-end o) end)
-                   (move-overlay o end (overlay-end o))
-                 (delete-overlay o)))))
+                   (progn 
+                     (setq o1 (outline-copy-overlay o))
+                     (move-overlay o1 (overlay-start o1) beg)
+                     (move-overlay o end (overlay-end o)))
+                 (move-overlay o (overlay-start o) beg))
+             (if (> (overlay-end o) end)
+                 (move-overlay o end (overlay-end o))
+               (delete-overlay o))))
        (setq overlays (cdr overlays))))))
 
 ;; Make a copy of overlay O, with the same beginning, end and properties.