# HG changeset patch # User Glenn Morris # Date 1190911294 0 # Node ID b288edc441a815b4b41eee70ee44f2a9bbe5f837 # Parent 3977b897d1a1deccc2524ae7aac08fdefda66c7c Simplify previous change (auto can only be non-nil if type is). diff -r 3977b897d1a1 -r b288edc441a8 lisp/image.el --- a/lisp/image.el Thu Sep 27 11:55:06 2007 +0000 +++ b/lisp/image.el Thu Sep 27 16:41:34 2007 +0000 @@ -348,7 +348,7 @@ must be available." (let* ((type (image-type-from-buffer)) (auto (and type (cdr (assq type image-type-auto-detectable))))) - (and type auto + (and auto (or (eq auto t) (image-type-available-p type)))))