Browse files

(w3m-imagick-convert-program-available-p): If someone

set `w3m-imagick-convert-program' to nil before load emacs-w3m, do not
show warning message for ImageMagick's `convert'.
  • Loading branch information...
1 parent 1bd5904 commit 8d156fcf63001082c2b8ba300859c32508bda549 shirai committed Sep 2, 2009
Showing with 9 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +3 −2 w3m-image.el
View
6 ChangeLog
@@ -1,3 +1,9 @@
+2009-09-02 Hideyuki SHIRAI <shirai@meadowy.org>
+
+ * w3m-image.el (w3m-imagick-convert-program-available-p): If someone
+ set `w3m-imagick-convert-program' to nil before load emacs-w3m, do not
+ show warning message for ImageMagick's `convert'.
+
2009-09-02 Katsumi Yamaoka <yamaoka@jpl.org>
* w3m-mail.el (w3m-mail-embed-base-url, w3m-mail-compose-with-mml)
View
5 w3m-image.el
@@ -122,8 +122,9 @@ nil forcibly."
(looking-at "\211PNG\r\n"))))
t)
(t
- (message "ImageMagick's `convert' program is not available")
- (sit-for 1)
+ (when w3m-imagick-convert-program
+ (message "ImageMagick's `convert' program is not available")
+ (sit-for 1))
(setq w3m-imagick-convert-program nil
w3m-resize-images nil)
(put 'w3m-imagick-convert-program 'available-p 'no)

0 comments on commit 8d156fc

Please sign in to comment.