diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2006-01-11 22:30:26 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2006-01-11 22:30:26 +0000 |
| commit | 23e0c1a3bc240a544bdc3069a37ece1ca8d4b891 (patch) | |
| tree | 8382d4e1cde477f14a33615d148fc2acb19ee9b4 /lisp/reveal.el | |
| parent | 549afb31aec10e239c9d2c4a8f60d763035c1b44 (diff) | |
| download | emacs-23e0c1a3bc240a544bdc3069a37ece1ca8d4b891.tar.gz | |
(reveal-post-command): window-buffer signals an error on
dead windows rather than returning nil.
(reveal-open-new-overlays): An overlay might die while we open others.
Diffstat (limited to 'lisp/reveal.el')
| -rw-r--r-- | lisp/reveal.el | 63 |
1 files changed, 33 insertions, 30 deletions
diff --git a/lisp/reveal.el b/lisp/reveal.el index 3c76c2a2e8b..4120f9331b3 100644 --- a/lisp/reveal.el +++ b/lisp/reveal.el @@ -85,7 +85,8 @@ Each element has the form (WINDOW . OVERLAY).") ;; a window which does not show this buffer any more. (cond ((eq (car x) (selected-window)) (cdr x)) - ((not (eq (window-buffer (car x)) (current-buffer))) + ((not (and (window-live-p (car x)) + (eq (window-buffer (car x)) (current-buffer)))) ;; Adopt this since it's owned by a window that's ;; either not live or at least not showing this ;; buffer any more. @@ -104,35 +105,37 @@ Each element has the form (WINDOW . OVERLAY).") (overlays-at (mark))) (overlays-at (point)))) (setq old-ols (delq ol old-ols)) - (let ((inv (overlay-get ol 'invisible)) open) - (when (and inv - ;; There's an `invisible' property. Make sure it's - ;; actually invisible, and ellipsised. - (and (consp buffer-invisibility-spec) - (cdr (assq inv buffer-invisibility-spec))) - (or (setq open - (or (overlay-get ol 'reveal-toggle-invisible) - (and (symbolp inv) - (get inv 'reveal-toggle-invisible)) - (overlay-get ol 'isearch-open-invisible-temporary))) - (overlay-get ol 'isearch-open-invisible) - (and (consp buffer-invisibility-spec) - (cdr (assq inv buffer-invisibility-spec)))) - (overlay-put ol 'reveal-invisible inv)) - (push (cons (selected-window) ol) reveal-open-spots) - (if (null open) - (overlay-put ol 'invisible nil) - ;; Use the provided opening function and repeat (since the - ;; opening function might have hidden a subpart around point). - (setq repeat t) - (condition-case err - (funcall open ol nil) - (error (message "!!Reveal-show (funcall %s %s nil): %s !!" - open ol err) - ;; Let's default to a meaningful behavior to avoid - ;; getting stuck in an infinite loop. - (setq repeat nil) - (overlay-put ol 'invisible nil))))))))) + (when (overlay-start ol) ;Check it's still live. + (let ((inv (overlay-get ol 'invisible)) open) + (when (and inv + ;; There's an `invisible' property. Make sure it's + ;; actually invisible, and ellipsised. + (and (consp buffer-invisibility-spec) + (cdr (assq inv buffer-invisibility-spec))) + (or (setq open + (or (overlay-get ol 'reveal-toggle-invisible) + (and (symbolp inv) + (get inv 'reveal-toggle-invisible)) + (overlay-get ol 'isearch-open-invisible-temporary))) + (overlay-get ol 'isearch-open-invisible) + (and (consp buffer-invisibility-spec) + (cdr (assq inv buffer-invisibility-spec)))) + (overlay-put ol 'reveal-invisible inv)) + (push (cons (selected-window) ol) reveal-open-spots) + (if (null open) + (overlay-put ol 'invisible nil) + ;; Use the provided opening function and repeat (since the + ;; opening function might have hidden a subpart around point + ;; or moved/killed some of the overlays). + (setq repeat t) + (condition-case err + (funcall open ol nil) + (error (message "!!Reveal-show (funcall %s %s nil): %s !!" + open ol err) + ;; Let's default to a meaningful behavior to avoid + ;; getting stuck in an infinite loop. + (setq repeat nil) + (overlay-put ol 'invisible nil)))))))))) old-ols) (defun reveal-close-old-overlays (old-ols) |