From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 9 Jan 2013 22:47:27 +0000 (-0500)
Subject: * lisp/image-mode.el (image-mode-winprops): Don't throw away the fallback
X-Git-Tag: emacs-24.2.92~3
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08ce64e637608fc8beadd271c301361a2aa7cf2c;p=emacs.git

* lisp/image-mode.el (image-mode-winprops): Don't throw away the fallback
`t' pseudo-window entry.
---

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.