# HG changeset patch
# User Martin Rudalics <rudalics@gmx.at>
# Date 1231581088 0
# Node ID 246092ea84772c06aca4becdf5d73226c0ae9485
# Parent  94fbb2d40d7f6a0475e6eb8d83d4965a67b8c92b
(tool-bar-mode): Modify all frame parameters when
toggling tool bars on.  (Bug#1754)

diff -r 94fbb2d40d7f -r 246092ea8477 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 10 05:23:42 2009 +0000
+++ b/lisp/ChangeLog	Sat Jan 10 09:51:28 2009 +0000
@@ -1,3 +1,8 @@
+2009-01-10  Martin Rudalics  <rudalics@gmx.at>
+
+	* tool-bar.el (tool-bar-mode): Modify all frame parameters when
+	toggling tool bars on.  (Bug#1754)
+
 2009-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
 	* faces.el (face-valid-attribute-values): Use string as value for
diff -r 94fbb2d40d7f -r 246092ea8477 lisp/tool-bar.el
--- a/lisp/tool-bar.el	Sat Jan 10 05:23:42 2009 +0000
+++ b/lisp/tool-bar.el	Sat Jan 10 09:51:28 2009 +0000
@@ -54,9 +54,12 @@
   :group 'frames
   (if tool-bar-mode
       (progn
-  	(dolist (frame (frame-list))
-  	  (if (display-graphic-p frame)
-  	      (set-frame-parameter frame 'tool-bar-lines 1)))
+	;; Make one tool-bar-line for any - including non-graphical -
+	;; terminal, see Bug#1754.  If this causes problems, we should
+	;; handle the problem in `modify-frame-parameters' or do not
+	;; call `modify-all-frames-parameters' when toggling the tool
+	;; bar off either.
+	(modify-all-frames-parameters (list (cons 'tool-bar-lines 1)))
 	(if (= 1 (length (default-value 'tool-bar-map))) ; not yet setup
 	    (tool-bar-setup)))
     (modify-all-frames-parameters (list (cons 'tool-bar-lines 0)))))