diff options
| -rw-r--r-- | lisp/ChangeLog | 14 | ||||
| -rw-r--r-- | lisp/image-mode.el | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3c5dc44010b..0fd29f0ffba 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,12 @@ +2014-04-21 Stefan Monnier <monnier@iro.umontreal.ca> + + * 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 <dancol@dancol.org> - * 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 <dancol@dancol.org> diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 98fc3857f41..b75946475dd 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -90,9 +90,8 @@ otherwise it defaults to t, used for times when the buffer is not displayed." (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))))) |