diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/image-mode.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 778fe3dedd6..d7ffc144657 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-01-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * image-mode.el (image-mode-winprops): Don't throw away the fallback + `t' pseudo-window entry. + 2013-01-09 Alan Mackenzie <acm@muc.de> Fix bugs in the c-parse-state mechanism. Reuse some markers diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 90eb5dfaec5..a95dde1d999 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -63,8 +63,9 @@ otherwise it defaults to t, used for times when the buffer is not displayed." (when cleanup (setq image-mode-winprops-alist (delq nil (mapcar (lambda (winprop) - (if (window-live-p (car-safe winprop)) - winprop)) + (let ((w (car-safe winprop))) + (if (or (not (windowp w)) (window-live-p w)) + winprop))) image-mode-winprops-alist)))) (let ((winprops (assq window image-mode-winprops-alist))) ;; For new windows, set defaults from the latest. |