From: Glenn Morris <rgm@gnu.org>
Date: Thu, 27 Sep 2007 16:41:34 +0000 (+0000)
Subject: Simplify previous change (auto can only be non-nil if type is).
X-Git-Tag: emacs-pretest-23.0.90~10601
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d567be222cce21e4958a27906d81fceffa40a45c;p=emacs.git

Simplify previous change (auto can only be non-nil if type is).
---

diff --git a/lisp/image.el b/lisp/image.el
index 77f8ffe02c2..7e42c26dd69 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -348,7 +348,7 @@ non-nil value.  If that value is non-nil, but not t, then the image type
 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)))))