[Emacs-diffs] trunk r114347: * mail/rmailmm.el (rmail-mime-set-bulk-data): Silence --without-x compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 114347
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 20:47:11 -0700
message:
  * mail/rmailmm.el (rmail-mime-set-bulk-data): Silence --without-x compilation.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/mail/rmailmm.el           rmailmm.el-20091113204419-o5vbwnq5f7feedwu-8815

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-18 03:45:54 +0000
+++ b/lisp/ChangeLog    2013-09-18 03:47:11 +0000
@@ -1,5 +1,8 @@
 2013-09-18  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/mail/rmailmm.el'
--- a/lisp/mail/rmailmm.el      2013-01-19 20:38:13 +0000
+++ b/lisp/mail/rmailmm.el      2013-09-18 03:47:11 +0000
@@ -685,7 +685,8 @@
      ((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))