[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111163: * lisp/image-mode.el (image-mode-winprops): Don't throw away the fallback

[Stefan Monnier]

------------------------------------------------------------
revno: 111163
committer: Stefan Monnier <address@hidden>
branch nick: emacs-24
timestamp: Wed 2013-01-09 17:47:27 -0500
message:
  * lisp/image-mode.el (image-mode-winprops): Don't throw away the fallback
  `t' pseudo-window entry.
modified:
  lisp/ChangeLog
  lisp/image-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-01-09 21:33:00 +0000
+++ b/lisp/ChangeLog    2013-01-09 22:47:27 +0000
@@ -1,3 +1,8 @@
+2013-01-09  Stefan Monnier  <address@hidden>
+
+       * image-mode.el (image-mode-winprops): Don't throw away the fallback
+       `t' pseudo-window entry.
+
 2013-01-09  Alan Mackenzie  <address@hidden>
 
        Fix bugs in the c-parse-state mechanism.  Reuse some markers

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2013-01-01 09:11:05 +0000
+++ b/lisp/image-mode.el        2013-01-09 22:47:27 +0000
@@ -63,8 +63,9 @@
   (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.