Mercurial > emacs
changeset 95224:889084703e3f
(image-mode-winprops): Add argument CLEANUP to prune
image-mode-winprops-alist, preventing it from growing indefinitely.
(image-mode-reapply-winprops): Use it.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 22 May 2008 21:27:42 +0000 |
| parents | b1c20ce02fa2 |
| children | 22b86bc3a920 |
| files | lisp/image-mode.el |
| diffstat | 1 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/image-mode.el Thu May 22 21:27:25 2008 +0000 +++ b/lisp/image-mode.el Thu May 22 21:27:42 2008 +0000 @@ -56,10 +56,19 @@ "Special hook run when image data is requested in a new window. It is called with one argument, the initial WINPROPS.") -(defun image-mode-winprops (&optional window) +(defun image-mode-winprops (&optional window cleanup) "Return winprops of WINDOW. A winprops object has the shape (WINDOW . ALIST)." - (unless window (setq window (selected-window))) + (cond ((null window) + (setq window (selected-window))) + ((not (windowp window)) + (error "Not a window: %s" window))) + (when cleanup + (setq image-mode-winprops-alist + (delq nil (mapcar (lambda (winprop) + (if (window-live-p (car-safe winprop)) + winprop)) + image-mode-winprops-alist)))) (let ((winprops (assq window image-mode-winprops-alist))) ;; For new windows, set defaults from the latest. (unless winprops @@ -94,8 +103,9 @@ (defun image-mode-reapply-winprops () ;; When set-window-buffer, set hscroll and vscroll to what they were ;; last time the image was displayed in this window. - (when (listp image-mode-winprops-alist) - (let* ((winprops (image-mode-winprops)) + (when (and (image-get-display-property) + (listp image-mode-winprops-alist)) + (let* ((winprops (image-mode-winprops nil t)) (hscroll (image-mode-window-get 'hscroll winprops)) (vscroll (image-mode-window-get 'vscroll winprops))) (if hscroll (set-window-hscroll (selected-window) hscroll))