[Emacs-diffs] trunk r117004: * lisp/image-mode.el (image-mode-window-put): Don't assume there's a `t'

[Stefan Monnier]

------------------------------------------------------------
revno: 117004
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2014-04-21 10:34:49 -0400
message:
  * lisp/image-mode.el (image-mode-window-put): Don't assume there's a `t'
  entry in image-mode-winprops-alist.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/image-mode.el             
imagemode.el-20091113204419-o5vbwnq5f7feedwu-3391

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-21 09:34:21 +0000
+++ b/lisp/ChangeLog    2014-04-21 14:34:49 +0000
@@ -1,9 +1,12 @@
+2014-04-21  Stefan Monnier  <address@hidden>
+
+       * image-mode.el (image-mode-window-put): Don't assume there's a `t'
+       entry in image-mode-winprops-alist.
+
 2014-04-21  Daniel Colascione  <address@hidden>
 
-       * emacs-lisp/bytecomp.el (byte-compile-recurse-toplevel): New
-       function.
-       (byte-compile-recurse-toplevel,
-       (byte-compile-initial-macro-environment,
+       * emacs-lisp/bytecomp.el (byte-compile-recurse-toplevel): New function.
+       (byte-compile-recurse-toplevel, byte-compile-initial-macro-environment)
        (byte-compile-toplevel-file-form): Use it.
 
        * emacs-lisp/cl-macs.el:
@@ -14,8 +17,7 @@
        * vc/vc.el (vc-root-dir): New public autoloaded function for
        generically finding the current VC root.
        * vc/vc-hooks.el (vc-not-supported): New error.
-       (vc-call-backend): Signal `vc-not-supported' instead of generic
-       error.
+       (vc-call-backend): Signal `vc-not-supported' instead of generic error.
 
 2014-04-20  Daniel Colascione  <address@hidden>
 

=== modified file 'lisp/image-mode.el'
--- a/lisp/image-mode.el        2014-04-17 03:58:25 +0000
+++ b/lisp/image-mode.el        2014-04-21 14:34:49 +0000
@@ -90,9 +90,8 @@
 
 (defun image-mode-window-put (prop val &optional winprops)
   (unless (consp winprops) (setq winprops (image-mode-winprops winprops)))
-  (setcdr (assq t image-mode-winprops-alist)
-          (cons (cons prop val)
-                (delq (assq prop (cdr winprops)) (cdr winprops))))
+  (unless (eq t (car winprops))
+    (image-mode-window-put prop val t))
   (setcdr winprops (cons (cons prop val)
                          (delq (assq prop (cdr winprops)) (cdr winprops)))))