From: Glenn Morris Date: Wed, 18 Sep 2013 03:47:11 +0000 (-0700) Subject: * mail/rmailmm.el (rmail-mime-set-bulk-data): Silence --without-x compilation. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1562 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8a78544ece0e8939032c0fc4302ec057dd021ea5;p=emacs.git * mail/rmailmm.el (rmail-mime-set-bulk-data): Silence --without-x compilation. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd6e0572803..0875fca369a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-09-18 Glenn Morris + * 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 350e3dacbcf..f2437b16d14 100644 --- 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))