* mail/rmailmm.el (rmail-mime-set-bulk-data): Silence --without-x compilation.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd6e05728031f7bf29357ebf83b29fa745a66e18..0875fca369a89854f65e8284b62ac303f3ea8c94 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2013-09-18  Glenn Morris  <rgm@gnu.org>
 
+       * mail/rmailmm.el (rmail-mime-set-bulk-data):
+       Silence --without-x compilation.
+
        * wdired.el (dired-backup-overwrite): Remove declaration.
        (wdired-mode-map): Add doc string.
 

diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 350e3dacbcf6ae87209a3754e741425e70a58b1b..f2437b16d14ed0ac42a835fc8bb5a323b8bbcfed 100644 (file)
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -685,7 +685,8 @@ directly."
      ((string-match "image/\\(.*\\)" content-type)
       (setq type (image-type-from-file-name
                  (concat "." (match-string 1 content-type))))
-      (if (and (memq type image-types)
+      (if (and (boundp 'image-types)
+              (memq type image-types)
               (image-type-available-p type))
          (if (and rmail-mime-show-images
                   (not (eq rmail-mime-show-images 'button))