(custom-get-fresh-buffer): Kill overlays before erasing the buffer.

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 090503e67e77cd83e9adc211ac4f97a1ddbc1f14..9041ec3c14c91378b1c481e59c66081b98884f28 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1223,10 +1223,12 @@ not for everybody."
       (with-current-buffer buf
        (kill-all-local-variables)
        (run-hooks 'kill-buffer-hook)
-       (erase-buffer)
+       ;; Delete overlays before erasing the buffer so the overlay hooks
+       ;; don't get run spuriously when we erase the buffer.
        (let ((ols (overlay-lists)))
          (dolist (ol (nconc (car ols) (cdr ols)))
            (delete-overlay ol)))
+       (erase-buffer)
        buf))))
 
 ;;;###autoload