From 2d5d1e01003bb787dfc73766d0eb583c6412339e Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Tue, 4 Jul 2000 11:04:53 +0000
Subject: [PATCH] (wl-demo): Don't hide scroll bars under FSF Emacsen because
 it may incur an undesirable redrawing.

---
 wl/ChangeLog  |    5 +++--
 wl/wl-demo.el |   38 +++++++++++++++++---------------------
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 2decab8..adbbedb 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,7 +1,8 @@
 2000-07-04  Katsumi Yamaoka    <yamaoka@jpl.org>
 
-	* wl-demo.el (wl-demo): Make `kill-buffer-hook' buffer-local; don't
-	use `selected-frame' redundantly.
+	* 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.
 
 2000-07-04  Kenichi OKADA	<okada@opaopa.org>
 
diff --git a/wl/wl-demo.el b/wl/wl-demo.el
index 573ed3b..81c6c94 100644
--- a/wl/wl-demo.el
+++ b/wl/wl-demo.el
@@ -194,28 +194,24 @@ 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 19) window-system)
+	  ((and (> emacs-major-version 20) window-system (find-face 'fringe))
 	   (let* ((frame (selected-frame))
-		  (vbar (cdr (assq 'vertical-scroll-bars
-				   (frame-parameters frame))))
-		  (fbg (if (find-face 'fringe)
-			   (face-background 'fringe frame))))
-	     (make-local-hook 'kill-buffer-hook)
-	     (add-hook 'kill-buffer-hook
-		       (` (lambda ()
-			    (modify-frame-parameters
-			     (, frame) (list (cons 'vertical-scroll-bars
-						   (quote (, vbar)))))
-			    (if (, fbg)
-				(let ((unspecified nil))
-				  (set-face-background 'fringe (eval (, fbg))
-						       (, frame))))))
-		       nil t)
-	     (modify-frame-parameters frame '((vertical-scroll-bars)))
-	     (if (find-face 'fringe)
-		 (let* ((unspecified nil)
-			(bg (eval (face-background 'default))))
-		   (set-face-background 'fringe bg 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))))))))
     (erase-buffer)
     (setq truncate-lines t)
     (let* ((wl-demo-display-logo
-- 
1.7.10.4