From: yamaoka <yamaoka>
Date: Thu, 28 Sep 2000 23:53:25 +0000 (+0000)
Subject: (wl-e21-make-toolbar-buttons): Don't modify the value of `tool-bar-lines' in
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48103c91eb7b531eb03367cb2b5ab575e635f7b7;p=elisp%2Fwanderlust.git

(wl-e21-make-toolbar-buttons): Don't modify the value of `tool-bar-lines' in
the frame parameters.
(after-make-frame-functions, post-command-hook): Don't modify the value.
(wl-e21-switch-toolbar-after-make-frame, wl-e21-switch-toolbar,
wl-e21-tool-bar-lines): Removed.

;; Emacs 21 has started on using toolbars.  I'll go on with the work...
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index b21ebf4..e291620 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,14 @@
 2000-09-28  Katsumi Yamaoka    <yamaoka@jpl.org>
 
+	* wl-e21.el (wl-e21-make-toolbar-buttons): Don't modify the value
+	of `tool-bar-lines' in the frame parameters.
+	(after-make-frame-functions, post-command-hook): Don't modify the
+	value.
+	(wl-e21-switch-toolbar-after-make-frame, wl-e21-switch-toolbar,
+	wl-e21-tool-bar-lines): Removed.
+
+2000-09-28  Katsumi Yamaoka    <yamaoka@jpl.org>
+
 	* wl-highlight.el (wl-highlight-folder-path): Put overlay
 	properties `evaporate' and `wl-momentary-overlay' as well.
 	(wl-highlight-summary-displaying): Ditto.
@@ -34,7 +43,6 @@
 
 2000-09-26  Katsumi Yamaoka    <yamaoka@jpl.org>
 
-	NOTE: This change should be fixed in the future.
 	* wl-e21.el (after-make-frame-functions): Add
 	`wl-e21-force-switch-toolbar'.
 	(wl-e21-force-switch-toolbar): New function force to switch the
diff --git a/wl/wl-e21.el b/wl/wl-e21.el
index 380c976..3569dbf 100644
--- a/wl/wl-e21.el
+++ b/wl/wl-e21.el
@@ -180,31 +180,11 @@
     (tool-bar-button-margin      . 0)
     (tool-bar-button-relief      . 2)))
 
-;; FIXME! It's only a quick hack.
-(defvar wl-e21-tool-bar-lines nil)
-(defun wl-e21-switch-toolbar ()
-  (let* ((frame (selected-frame))
-	 (old (frame-parameter frame 'tool-bar-lines))
-	 (new (or wl-e21-tool-bar-lines
-		  (cdr (assq 'tool-bar-lines default-frame-alist)))))
-    (unless (eq old new)
-      (modify-frame-parameters frame (list (cons 'tool-bar-lines new))))))
-(add-hook 'post-command-hook 'wl-e21-switch-toolbar)
-(defun wl-e21-switch-toolbar-after-make-frame (frame)
-  (modify-frame-parameters
-   frame (list (cons 'tool-bar-lines (or wl-e21-tool-bar-lines
-					 (frame-parameter frame
-							  'tool-bar-lines))))))
-(add-hook 'after-make-frame-functions 'wl-e21-switch-toolbar-after-make-frame)
-
 (defun wl-e21-make-toolbar-buttons (keymap defs)
   (let ((configs wl-e21-toolbar-configurations)
 	config)
     (while (setq config (pop configs))
       (set (make-local-variable (car config)) (cdr config))))
-  (modify-frame-parameters (selected-frame) '((tool-bar-lines . 1)))
-  (set (make-local-variable 'wl-e21-tool-bar-lines)
-       (frame-parameter (selected-frame) 'tool-bar-lines))
   (let ((n (1- (length defs)))
 	def)
     (while (>= n 0)