From: yamaoka <yamaoka>
Date: Thu, 26 Oct 2000 12:44:36 +0000 (+0000)
Subject: (wl-demo): Don't use `fancy-splash-insert'.
X-Git-Tag: wl-2_4-root~74
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=088fcf203dd50e445ce5dd8fd0e19eacb32bf238;p=elisp%2Fwanderlust.git

(wl-demo): Don't use `fancy-splash-insert'.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 72ccab0..825a732 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-26  Katsumi Yamaoka    <yamaoka@jpl.org>
+
+	* wl-demo.el (wl-demo): Don't use `fancy-splash-insert'.
+
 2000-10-26  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-highlight.el (wl-highlight-message):
diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index 5415de9..c1e4b31 100644
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -49,7 +49,6 @@
   (defalias-maybe 'create-image 'ignore)
   (defalias-maybe 'device-on-window-system-p 'ignore)
   (defalias-maybe 'display-graphic-p 'ignore)
-  (defalias-maybe 'fancy-splash-insert 'ignore)
   (defalias-maybe 'frame-char-height 'ignore)
   (defalias-maybe 'frame-char-width 'ignore)
   (defalias-maybe 'frame-parameter 'ignore)
@@ -324,14 +323,13 @@ Optional IMAGE-TYPE overrides the variable `wl-demo-display-logo'."
 			  wl-demo-copyright-notice)))
 	(if wl-on-emacs21
 	    (let ((bg (face-background 'wl-highlight-demo-face))
-		  (fg (face-foreground 'wl-highlight-demo-face))
-		  (face '(variable-pitch)))
-	      (if (stringp bg)
-		  (setcdr face (list ':background bg)))
-	      (if (stringp fg)
-		  (setq face (nconc face (list ':foreground fg))))
-	      (let (fancy-splash-help-echo)
-		(fancy-splash-insert ':face face text)))
+		  (fg (face-foreground 'wl-highlight-demo-face)))
+	      (insert (propertize text
+				  'face (nconc '(variable-pitch)
+					       (if (stringp bg)
+						   (list ':background bg))
+					       (if (stringp fg)
+						   (list ':foreground fg))))))
 	  (insert text)
 	  (put-text-property start (point) 'face 'wl-highlight-demo-face))
 	(let ((fill-column ww))