diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mail/rmailmm.el | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd6e0572803..0875fca369a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-09-18 Glenn Morris <rgm@gnu.org> | 1 | 2013-09-18 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * mail/rmailmm.el (rmail-mime-set-bulk-data): | ||
| 4 | Silence --without-x compilation. | ||
| 5 | |||
| 3 | * wdired.el (dired-backup-overwrite): Remove declaration. | 6 | * wdired.el (dired-backup-overwrite): Remove declaration. |
| 4 | (wdired-mode-map): Add doc string. | 7 | (wdired-mode-map): Add doc string. |
| 5 | 8 | ||
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." | |||
| 685 | ((string-match "image/\\(.*\\)" content-type) | 685 | ((string-match "image/\\(.*\\)" content-type) |
| 686 | (setq type (image-type-from-file-name | 686 | (setq type (image-type-from-file-name |
| 687 | (concat "." (match-string 1 content-type)))) | 687 | (concat "." (match-string 1 content-type)))) |
| 688 | (if (and (memq type image-types) | 688 | (if (and (boundp 'image-types) |
| 689 | (memq type image-types) | ||
| 689 | (image-type-available-p type)) | 690 | (image-type-available-p type)) |
| 690 | (if (and rmail-mime-show-images | 691 | (if (and rmail-mime-show-images |
| 691 | (not (eq rmail-mime-show-images 'button)) | 692 | (not (eq rmail-mime-show-images 'button)) |