From: ueno <ueno>
Date: Fri, 18 Feb 2000 04:16:27 +0000 (+0000)
Subject: * pimage.el: Require image-stpl instead of tinyimage when face
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=8c489d6d304d80f2cbc3e3eb3b78e2c139cda7f7;p=elisp%2Fapel.git

* pimage.el: Require image-stpl instead of tinyimage when face
stipple pixmap is usable.

* image-bm.el: Don't require bitmap when compiling.
---

diff --git a/image-bm.el b/image-bm.el
index 275a178..ce55c84 100644
--- a/image-bm.el
+++ b/image-bm.el
@@ -29,8 +29,6 @@
 
 (require 'poe)
 
-(eval-when-compile (require 'bitmap))
-
 (defun-maybe image-type-available-p (type)
   "Value is non-nil if image type TYPE is available.
 Image types are symbols like `xbm' or `jpeg'.
@@ -64,7 +62,7 @@ Value is the image created, or nil if images of type TYPE are not supported.
 	      (setq bitmap (concat bitmap "\n"
 				   (bitmap-compose (aref image i)))
 		    i (1+ i)))
-	    (put-text-property 1 (string-width bitmap) 'pimage-bitmap bitmap)
+	    (put-text-property 1 (length bitmap) 'pimage-bitmap bitmap)
 	    bitmap)
 	(error nil)))))
 
diff --git a/pimage.el b/pimage.el
index 5af2bdf..f393887 100644
--- a/pimage.el
+++ b/pimage.el
@@ -36,12 +36,13 @@
  ((featurep 'mule)
   (condition-case nil
       (require 'image)
-    (file-error
+    (error
      (condition-case nil
-	 (progn
-	   (require 'bitmap)
-	   (require 'image-bm))
-       (file-error (require 'tinyimage.el))))))
+	 (progn (require 'bitmap) (require 'image-bm))
+       (error 
+	(if (fboundp 'set-face-stipple)
+	    (require 'image-stpl)
+	  (require 'tinyimage.el)))))))
  (t (require 'tinyimage.el)))
 
 (require 'product)