From: yamaoka <yamaoka>
Date: Tue, 4 Jul 2000 23:26:40 +0000 (+0000)
Subject: (wl-demo): Simplified `fringe' face manipulation.
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40d778dd626cd535565464e81b7c3da6a42fe52a;p=elisp%2Fwanderlust.git

(wl-demo): Simplified `fringe' face manipulation.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index adbbedb..e71f826 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,9 @@
 2000-07-04  Katsumi Yamaoka    <yamaoka@jpl.org>
 
+	* wl-demo.el (wl-demo): Simplified `fringe' face manipulation.
+
+2000-07-04  Katsumi Yamaoka    <yamaoka@jpl.org>
+
 	* wl-demo.el (wl-demo): Make `kill-buffer-hook' buffer-local;
 	don't hide scroll bars under FSF Emacsen because it may incur an
 	undesirable redrawing.
diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index 81c6c94..21f201f 100644
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -194,24 +194,19 @@ Optional IMAGE-TYPE overrides the variable `wl-demo-display-logo'."
 			      nil demo-buf))
 	   (set-specifier (symbol-value 'scrollbar-height) 0 demo-buf)
 	   (set-specifier (symbol-value 'scrollbar-width) 0 demo-buf))
-	  ((and (> emacs-major-version 20) window-system (find-face 'fringe))
-	   (let* ((frame (selected-frame))
-		  (unspecified nil)
-		  (bg (eval (face-background 'default frame)))
-		  (fbg (eval (face-background 'fringe frame))))
-	     (if bg
-		 (progn
-		   (set-face-background 'fringe bg frame)
-		   (if fbg
-		       (progn
-			 (make-local-hook 'kill-buffer-hook)
-			 (add-hook 'kill-buffer-hook
-				   (` (lambda ()
-					(if (frame-live-p (, frame))
-					    (set-face-background 'fringe
-								 (, fbg)
-								 (, frame)))))
-				   nil t))))))))
+	  ((and (> emacs-major-version 20) window-system)
+	   (make-local-hook 'kill-buffer-hook)
+	   (let ((frame (selected-frame)))
+	     (add-hook 'kill-buffer-hook
+		       (` (lambda ()
+			    (if (frame-live-p (, frame))
+				(set-face-background
+				 'fringe
+				 (, (face-background 'fringe frame))
+				 (, frame)))))
+		       nil t)
+	     (set-face-background 'fringe (face-background 'default frame)
+				  frame))))
     (erase-buffer)
     (setq truncate-lines t)
     (let* ((wl-demo-display-logo